mirror of
https://github.com/Novetus/Novetus_src.git
synced 2025-01-31 09:41:33 +02:00
net 6 binaries build now
This commit is contained in:
Bitl
parent
e1c1c998bf
commit
ffb4729ce5
@ -14,10 +14,19 @@
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
|
||||
<DefineConstants>$(DefineConstants);BASICLAUNCHER;NOVETUS_APPS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Remove="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="NovetusIcon.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Mono.Nat" Version="1.2.24" />
|
||||
<PackageReference Include="NLog" Version="5.0.5" />
|
||||
<PackageReference Include="System.Management" Version="6.0.0" />
|
||||
</ItemGroup>
|
||||
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
|
||||
<Exec Command="SET path=$(SolutionDir)build
if not exist "%25path%25" mkdir "%25path%25"
SET path2=%25path%25\net6
if not exist "%25path2%25" mkdir "%25path2%25
copy $(ProjectDir)$(OutDir) "%25path2%25"\*
del "%25path%25"\$(TargetName).vshost.exe
del "%25path%25"\$(TargetName).vshost.exe.config
del "%25path%25"\$(TargetName).vshost.exe.manifest
del "%25path%25"\$(TargetName).xml" />
|
||||
</Target>
|
||||
<Import Project="..\NovetusCore\NovetusCore.projitems" Label="Shared" />
|
||||
</Project>
|
||||
@ -38,9 +38,6 @@
|
||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NLog.5.0.4\lib\net35\NLog.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Configuration" />
|
||||
<Reference Include="System.Core" />
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="NLog" version="5.0.4" targetFramework="net40" />
|
||||
<package id="NLog" version="5.0.5" targetFramework="net40" />
|
||||
</packages>
|
||||
@ -37,6 +37,9 @@ Global
|
||||
SolutionGuid = {66CA6CE5-670E-48AA-A2DA-9347371D4CA0}
|
||||
EndGlobalSection
|
||||
GlobalSection(SharedMSBuildProjectFiles) = preSolution
|
||||
NovetusCore\NovetusCore.projitems*{626d04b8-37a3-439c-bdb0-baa914b37ae5}*SharedItemsImports = 5
|
||||
NovetusCore\NovetusCore.projitems*{6bbca84a-28af-4ed3-a692-4b6ec8a5e964}*SharedItemsImports = 5
|
||||
NovetusCore\NovetusCore.projitems*{ad1772aa-a03f-4081-8979-b1c7c30c85c2}*SharedItemsImports = 5
|
||||
NovetusCore\NovetusCore.projitems*{debcc57d-9a3b-4d7c-8693-fa4aec56c8c1}*SharedItemsImports = 13
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
||||
76
Novetus/NovetusLauncher/Documentation.Designer.cs
generated
76
Novetus/NovetusLauncher/Documentation.Designer.cs
generated
@ -1,76 +0,0 @@
|
||||
/*
|
||||
* Created by SharpDevelop.
|
||||
* User: BITL
|
||||
* Date: 5/14/2017
|
||||
* Time: 9:14 AM
|
||||
*
|
||||
* To change this template use Tools | Options | Coding | Edit Standard Headers.
|
||||
*/
|
||||
namespace NovetusLauncher
|
||||
{
|
||||
partial class ServerInfo
|
||||
{
|
||||
/// <summary>
|
||||
/// Designer variable used to keep track of non-visual components.
|
||||
/// </summary>
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
/// <summary>
|
||||
/// Disposes resources used by the form.
|
||||
/// </summary>
|
||||
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing) {
|
||||
if (components != null) {
|
||||
components.Dispose();
|
||||
}
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// This method is required for Windows Forms designer support.
|
||||
/// Do not change the method contents inside the source code editor. The Forms designer might
|
||||
/// not be able to load this method if it was changed manually.
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServerInfo));
|
||||
this.textBox1 = new System.Windows.Forms.TextBox();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// textBox1
|
||||
//
|
||||
this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.textBox1.BackColor = System.Drawing.SystemColors.ControlLightLight;
|
||||
this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.textBox1.Location = new System.Drawing.Point(2, 3);
|
||||
this.textBox1.Multiline = true;
|
||||
this.textBox1.Name = "textBox1";
|
||||
this.textBox1.ReadOnly = true;
|
||||
this.textBox1.Size = new System.Drawing.Size(501, 256);
|
||||
this.textBox1.TabIndex = 0;
|
||||
//
|
||||
// ServerInfo
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.AutoScroll = true;
|
||||
this.BackColor = System.Drawing.SystemColors.ControlLightLight;
|
||||
this.ClientSize = new System.Drawing.Size(504, 262);
|
||||
this.Controls.Add(this.textBox1);
|
||||
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
||||
this.MaximizeBox = false;
|
||||
this.MinimumSize = new System.Drawing.Size(520, 300);
|
||||
this.Name = "ServerInfo";
|
||||
this.Text = "Server Info";
|
||||
this.Load += new System.EventHandler(this.ServerInfoLoad);
|
||||
this.ResumeLayout(false);
|
||||
this.PerformLayout();
|
||||
}
|
||||
private System.Windows.Forms.TextBox textBox1;
|
||||
}
|
||||
}
|
||||
@ -76,6 +76,11 @@ namespace NovetusLauncher
|
||||
}
|
||||
}
|
||||
|
||||
//NET 6 gives us an error, so we're adding this stuff manually.
|
||||
launcherFormStylishInterface1.styleBox.Items.Add(new StyleListItem("Extended"));
|
||||
launcherFormStylishInterface1.styleBox.Items.Add(new StyleListItem("Compact"));
|
||||
launcherFormStylishInterface1.styleBox.Items.Add(new StyleListItem("Stylish"));
|
||||
|
||||
LocalVars.launcherInitState = false;
|
||||
CenterToScreen();
|
||||
}
|
||||
|
||||
@ -867,11 +867,7 @@
|
||||
<Button x:Name="novetusSDKButton" Content="Novetus SDK" HorizontalAlignment="Left" Margin="313,67,0,0" VerticalAlignment="Top" Width="81" Click="novetusSDKButton_Click"/>
|
||||
<Button x:Name="settingsButtons" Style="{DynamicResource ImportantButtonSmall}" Content="Graphics Settings" HorizontalAlignment="Left" Margin="399,46,0,0" VerticalAlignment="Top" Width="119" Height="17" Click="settingsButtons_Click" Grid.ColumnSpan="2"/>
|
||||
<Button x:Name="modInstallerButton" Content="Install Mod Package" HorizontalAlignment="Left" Margin="399,67,0,0" VerticalAlignment="Top" Width="119" Click="modInstallerButton_Click" Grid.ColumnSpan="2"/>
|
||||
<ComboBox x:Name="styleBox" Grid.Column="1" HorizontalAlignment="Left" Margin="89,59,0,0" VerticalAlignment="Top" Width="107" Height="24" DropDownClosed="styleBox_DropDownClosed">
|
||||
<local:StyleListItem StyleName="Extended"/>
|
||||
<local:StyleListItem StyleName="Compact"/>
|
||||
<local:StyleListItem StyleName="Stylish"/>
|
||||
</ComboBox>
|
||||
<ComboBox x:Name="styleBox" Grid.Column="1" HorizontalAlignment="Left" Margin="89,59,0,0" VerticalAlignment="Top" Width="107" Height="24" DropDownClosed="styleBox_DropDownClosed"/>
|
||||
<Separator Style="{DynamicResource VerticalSeperator}" HorizontalAlignment="Left" Height="44" Margin="223,44,0,0" VerticalAlignment="Top" Width="5"/>
|
||||
<Label x:Name="styleLabel" Content="Launcher Style" Grid.Column="1" HorizontalAlignment="Left" Margin="89,37,0,0" VerticalAlignment="Top" Width="107" Height="26"/>
|
||||
</Grid>
|
||||
|
||||
@ -573,6 +573,11 @@ namespace NovetusLauncher
|
||||
{
|
||||
public string StyleName { get; set; }
|
||||
|
||||
public StyleListItem(string name)
|
||||
{
|
||||
StyleName = name;
|
||||
}
|
||||
|
||||
public override string ToString() { return StyleName; }
|
||||
}
|
||||
#endregion
|
||||
|
||||
@ -15,10 +15,31 @@
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
|
||||
<DefineConstants>$(DefineConstants);LAUNCHER;NOVETUS_APPS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Remove="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="..\NovetusCore\CharCustom\CharacterCustomizationShared.cs" Link="Forms\CharCustom\CharacterCustomizationShared.cs" />
|
||||
<Compile Include="..\NovetusCore\CharCustom\Forms\Compact\CharacterCustomizationCompact.cs" Link="Forms\CharCustom\Compact\CharacterCustomizationCompact.cs" />
|
||||
<Compile Include="..\NovetusCore\CharCustom\Forms\Compact\CharacterCustomizationCompact.Designer.cs" Link="Forms\CharCustom\Compact\CharacterCustomizationCompact.Designer.cs" />
|
||||
<Compile Include="..\NovetusCore\CharCustom\Forms\Extended\CharacterCustomizationExtended.cs" Link="Forms\CharCustom\Extended\CharacterCustomizationExtended.cs" />
|
||||
<Compile Include="..\NovetusCore\CharCustom\Forms\Extended\CharacterCustomizationExtended.Designer.cs" Link="Forms\CharCustom\Extended\CharacterCustomizationExtended.Designer.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="NovetusIcon.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="DotNetZip" Version="1.16.0" />
|
||||
<PackageReference Include="Mono.Nat" Version="1.2.24" />
|
||||
<PackageReference Include="NLog" Version="5.0.5" />
|
||||
<PackageReference Include="System.Management" Version="6.0.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Forms\CharCustom\Compact\" />
|
||||
<Folder Include="Forms\CharCustom\Extended\" />
|
||||
</ItemGroup>
|
||||
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
|
||||
<Exec Command="SET path=$(SolutionDir)build
if not exist "%25path%25" mkdir "%25path%25"
SET path2=%25path%25\net6
if not exist "%25path2%25" mkdir "%25path2%25
SET path3=%25path2%25\Launcher
if not exist "%25path3%25" mkdir "%25path3%25
copy $(ProjectDir)$(OutDir) "%25path3%25"\*
del "%25path%25"\$(TargetName).vshost.exe
del "%25path%25"\$(TargetName).vshost.exe.config
del "%25path%25"\$(TargetName).vshost.exe.manifest
del "%25path%25"\$(TargetName).xml
if not exist "%25path2%25"\bin mkdir "%25path2%25"\bin
move "%25path3%25"\* "%25path2%25"\bin
rd /s /q "%25path3%25"" />
|
||||
</Target>
|
||||
<Import Project="..\NovetusCore\NovetusCore.projitems" Label="Shared" />
|
||||
</Project>
|
||||
@ -101,9 +101,6 @@
|
||||
<Reference Include="Mono.Nat">
|
||||
<HintPath>..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NLog.5.0.4\lib\net35\NLog.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="PresentationCore" />
|
||||
<Reference Include="PresentationFramework" />
|
||||
<Reference Include="ReachFramework" />
|
||||
|
||||
@ -5,5 +5,5 @@
|
||||
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net40" />
|
||||
<package id="Mono.Nat" version="1.2.24.0" targetFramework="net40" />
|
||||
<package id="NLog" version="5.0.4" targetFramework="net40" />
|
||||
<package id="NLog" version="5.0.5" targetFramework="net40" />
|
||||
</packages>
|
||||
@ -17,7 +17,27 @@
|
||||
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
|
||||
<Exec Command="SET path=$(SolutionDir)build
if not exist "%25path%25" mkdir "%25path%25"
SET path2=%25path%25\net6
if not exist "%25path2%25" mkdir "%25path2%25
SET path3=%25path2%25\URI
if not exist "%25path3%25" mkdir "%25path3%25
copy $(ProjectDir)$(OutDir) "%25path3%25"\*
del "%25path%25"\$(TargetName).vshost.exe
del "%25path%25"\$(TargetName).vshost.exe.config
del "%25path%25"\$(TargetName).vshost.exe.manifest
del "%25path%25"\$(TargetName).xml
if not exist "%25path2%25"\bin mkdir "%25path2%25"\bin
move "%25path3%25"\* "%25path2%25"\bin
rd /s /q "%25path3%25"" />
|
||||
</Target>
|
||||
<ItemGroup>
|
||||
<Compile Remove="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="..\NovetusCore\CharCustom\CharacterCustomizationShared.cs" Link="Forms\CharCustom\CharacterCustomizationShared.cs" />
|
||||
<Compile Include="..\NovetusCore\CharCustom\Forms\Compact\CharacterCustomizationCompact.cs" Link="Forms\CharCustom\Compact\CharacterCustomizationCompact.cs" />
|
||||
<Compile Include="..\NovetusCore\CharCustom\Forms\Compact\CharacterCustomizationCompact.Designer.cs" Link="Forms\CharCustom\Compact\CharacterCustomizationCompact.Designer.cs" />
|
||||
<Compile Include="..\NovetusCore\CharCustom\Forms\Extended\CharacterCustomizationExtended.cs" Link="Forms\CharCustom\Extended\CharacterCustomizationExtended.cs" />
|
||||
<Compile Include="..\NovetusCore\CharCustom\Forms\Extended\CharacterCustomizationExtended.Designer.cs" Link="Forms\CharCustom\Extended\CharacterCustomizationExtended.Designer.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="NovetusIcon.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Forms\CharCustom\Compact\" />
|
||||
<Folder Include="Forms\CharCustom\Extended\" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Mono.Nat" Version="1.2.24" />
|
||||
<PackageReference Include="NLog" Version="5.0.5" />
|
||||
<PackageReference Include="System.Management" Version="6.0.0" />
|
||||
</ItemGroup>
|
||||
<Import Project="..\NovetusCore\NovetusCore.projitems" Label="Shared" />
|
||||
</Project>
|
||||
@ -61,9 +61,6 @@
|
||||
<Reference Include="Mono.Nat, Version=1.2.24.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NLog.5.0.4\lib\net35\NLog.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Configuration" />
|
||||
<Reference Include="System.Core" />
|
||||
|
||||
@ -4,5 +4,5 @@
|
||||
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
|
||||
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net40" />
|
||||
<package id="Mono.Nat" version="1.2.24.0" targetFramework="net40" />
|
||||
<package id="NLog" version="5.0.4" targetFramework="net40" />
|
||||
<package id="NLog" version="5.0.5" targetFramework="net40" />
|
||||
</packages>
|
||||
Loading…
Reference in New Issue
Block a user