upgrade project & migrate to .NET 6
This commit is contained in:
@@ -2,58 +2,15 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>net6.0-windows7</TargetFramework>
|
<TargetFramework>net6.0-windows</TargetFramework>
|
||||||
<UseWindowsForms>true</UseWindowsForms>
|
<UseWindowsForms>true</UseWindowsForms>
|
||||||
<RootNamespace>SM64_ROM_Manager.LangRes_Collector</RootNamespace>
|
<RootNamespace>SM64_ROM_Manager.LangRes_Collector</RootNamespace>
|
||||||
<StartupObject>SM64_ROM_Manager.LangRes_Collector.Program</StartupObject>
|
<StartupObject>SM64_ROM_Manager.LangRes_Collector.Program</StartupObject>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="FastColoredTextBox.Net5" Version="2.16.26" />
|
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
|
||||||
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<Reference Include="DevComponents.Charts.Design">
|
|
||||||
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.Charts.Design.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DevComponents.DotNetBar.Charts">
|
|
||||||
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Charts.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DevComponents.DotNetBar.Design">
|
|
||||||
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Design.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DevComponents.DotNetBar.Keyboard">
|
|
||||||
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Keyboard.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DevComponents.DotNetBar.Layout">
|
|
||||||
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Layout.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DevComponents.DotNetBar.Layout.Design">
|
|
||||||
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Layout.Design.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DevComponents.DotNetBar.Schedule">
|
|
||||||
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.Schedule.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DevComponents.DotNetBar.SuperGrid">
|
|
||||||
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar.SuperGrid.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DevComponents.DotNetBar2">
|
|
||||||
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar2.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DevComponents.Instrumentation">
|
|
||||||
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.Instrumentation.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DevComponents.Instrumentation.Design">
|
|
||||||
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.Instrumentation.Design.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DevComponents.SuperGrid.Design">
|
|
||||||
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.SuperGrid.Design.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DevComponents.TreeGX">
|
|
||||||
<HintPath>..\Shared Libs\DotNetBarNew\DevComponents.TreeGX.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<RootNamespace>SM64_ROM_Manager.ProgressUpdater</RootNamespace>
|
<RootNamespace>SM64_ROM_Manager.ProgressUpdater</RootNamespace>
|
||||||
<AssemblyName>SM64RM ProgressUpdater</AssemblyName>
|
<AssemblyName>SM64RM ProgressUpdater</AssemblyName>
|
||||||
<MyType>WindowsForms</MyType>
|
<MyType>WindowsForms</MyType>
|
||||||
<TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
|
<TargetFramework>net6.0-windows</TargetFramework>
|
||||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||||
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
|
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
@@ -43,12 +43,12 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="HtmlRenderer.Core" Version="1.5.0.6" />
|
<PackageReference Include="HtmlRenderer.Core" Version="1.5.0.6" />
|
||||||
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
|
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
|
||||||
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
|
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
|
||||||
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
|
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
|
||||||
<PackageReference Include="System.ComponentModel.Composition" Version="6.0.0" />
|
<PackageReference Include="System.ComponentModel.Composition" Version="7.0.0" />
|
||||||
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
|
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
|
||||||
<PackageReference Include="UI.for.WinForms.AllControls.Net60">
|
<PackageReference Include="UI.for.WinForms.AllControls.Net60">
|
||||||
<Version>2022.2.510</Version>
|
<Version>2023.1.117</Version>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@@ -149,21 +149,21 @@
|
|||||||
<Content Include="1443729764_forest_mushroom.ico" />
|
<Content Include="1443729764_forest_mushroom.ico" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Discord.Net" Version="3.7.2" />
|
<PackageReference Include="Discord.Net" Version="3.12.0" />
|
||||||
<PackageReference Include="Markdig" Version="0.30.2" />
|
<PackageReference Include="Markdig" Version="0.33.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
|
||||||
<PackageReference Include="Microsoft.NETCore.Platforms" Version="6.0.3" />
|
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
|
||||||
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
|
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
|
||||||
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
|
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||||
<PackageReference Include="System.AppContext" Version="4.3.0" />
|
<PackageReference Include="System.AppContext" Version="4.3.0" />
|
||||||
<PackageReference Include="System.Collections" Version="4.3.0" />
|
<PackageReference Include="System.Collections" Version="4.3.0" />
|
||||||
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
|
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
|
||||||
<PackageReference Include="System.Collections.Immutable" Version="6.0.0" />
|
<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
|
||||||
<PackageReference Include="System.ComponentModel" Version="4.3.0" />
|
<PackageReference Include="System.ComponentModel" Version="4.3.0" />
|
||||||
<PackageReference Include="System.Console" Version="4.3.1" />
|
<PackageReference Include="System.Console" Version="4.3.1" />
|
||||||
<PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
|
<PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
|
||||||
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
|
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
|
||||||
<PackageReference Include="System.Diagnostics.Tools" Version="4.3.0" />
|
<PackageReference Include="System.Diagnostics.Tools" Version="4.3.0" />
|
||||||
<PackageReference Include="System.Diagnostics.Tracing" Version="4.3.0" />
|
<PackageReference Include="System.Diagnostics.Tracing" Version="4.3.0" />
|
||||||
<PackageReference Include="System.Globalization" Version="4.3.0" />
|
<PackageReference Include="System.Globalization" Version="4.3.0" />
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<RootNamespace>SM64_ROM_Manager.UpdateInstallerAddOn</RootNamespace>
|
<RootNamespace>SM64_ROM_Manager.UpdateInstallerAddOn</RootNamespace>
|
||||||
<MyType>Windows</MyType>
|
<MyType>Windows</MyType>
|
||||||
<TargetFramework>net48</TargetFramework>
|
<TargetFramework>net6.0-windows</TargetFramework>
|
||||||
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
|
<DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
<AssemblyTitle>SM64 ROM Manager.UpdateInstallerAddOn</AssemblyTitle>
|
<AssemblyTitle>SM64 ROM Manager.UpdateInstallerAddOn</AssemblyTitle>
|
||||||
@@ -31,16 +31,6 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OptionInfer>On</OptionInfer>
|
<OptionInfer>On</OptionInfer>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
|
|
||||||
<PackageReference Include="System.Net.Http" Version="4.3.4" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Reference Include="Microsoft.VisualBasic" />
|
|
||||||
<Reference Include="Pilz.Updating">
|
|
||||||
<HintPath>..\Shared Libs\Pilz.Updating.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Import Include="Microsoft.VisualBasic" />
|
<Import Include="Microsoft.VisualBasic" />
|
||||||
<Import Include="System" />
|
<Import Include="System" />
|
||||||
@@ -87,4 +77,7 @@
|
|||||||
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
|
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
|
||||||
</None>
|
</None>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Pilz.Updating" Version="1.2023.914.1123" />
|
||||||
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
Binary file not shown.
@@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<configuration>
|
|
||||||
<startup>
|
|
||||||
|
|
||||||
<supportedRuntime version="v2.0.50727"/></startup>
|
|
||||||
</configuration>
|
|
||||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
@@ -1,3 +0,0 @@
|
|||||||
<?xml version="1.0"?>
|
|
||||||
<configuration>
|
|
||||||
<startup/></configuration>
|
|
||||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Reference in New Issue
Block a user