Skip to content

Converted all projects to .NET 6 #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
LennardF1989 wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Converted all projects to .NET 6 #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
baa4abe
Converted all projects to .NET 6
LennardF1989 Aug 14, 2023
eb8a6be
Converted everything to x64, because LSLibNative is.
LennardF1989 Aug 24, 2023
083837f
Updated all NuGet packages
LennardF1989 Aug 24, 2023
fedc481
Add support for generating a proper NuGet package
LennardF1989 Aug 24, 2023
3e073e2
Updated NuGet package version
LennardF1989 Sep 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,6 @@ DebuggerFrontend/DbgProtocol.cs
WwiseTool
UnpackGrid/Properties/launchSettings.json
TerrainFixup/Properties/launchSettings.json

# Other
/LSLib/StatProperty.lst
6 changes: 0 additions & 6 deletions ConverterApp/App.config
View file
Open in desktop

This file was deleted.

235 changes: 14 additions & 221 deletions ConverterApp/ConverterApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,197 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{FAD67294-6223-47E0-8838-E4E7FBC53ED2}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ConverterApp</RootNamespace>
<AssemblyName>ConverterApp</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x64</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputType>Exe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<UseWindowsForms>true</UseWindowsForms>
<Title>LSLib Toolkit - Main Application</Title>
<Product>LSLib</Product>
<Copyright>Copyright © Norbyte 2012-2023</Copyright>
<PlatformTarget>x64</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>
</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<RunPostBuildEvent>Always</RunPostBuildEvent>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Editor Debug|AnyCPU'">
<OutputPath>bin\Editor Debug\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>

<ItemGroup>
<Reference Include="AlphaFS, Version=2.2.0.0, Culture=neutral, PublicKeyToken=4d31a58f7d7ad5c9, processorArchitecture=MSIL">
<HintPath>..\packages\AlphaFS.2.2.6\lib\net452\AlphaFS.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Transactions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="ConverterAppSettings.cs" />
<Compile Include="DatabaseDumper.cs" />
<Compile Include="DebugDumper.cs" />
<Compile Include="DebugPane.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="DebugPane.Designer.cs">
<DependentUpon>DebugPane.cs</DependentUpon>
</Compile>
<Compile Include="ExportItemSelection.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ExportItemSelection.Designer.cs">
<DependentUpon>ExportItemSelection.cs</DependentUpon>
</Compile>
<Compile Include="GR2Pane.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="GR2Pane.Designer.cs">
<DependentUpon>GR2Pane.cs</DependentUpon>
</Compile>
<Compile Include="LocalizationPane.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="LocalizationPane.Designer.cs">
<DependentUpon>LocalizationPane.cs</DependentUpon>
</Compile>
<Compile Include="MainForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MainForm.Designer.cs">
<DependentUpon>MainForm.cs</DependentUpon>
</Compile>
<Compile Include="OsirisPane.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="OsirisPane.Designer.cs">
<DependentUpon>OsirisPane.cs</DependentUpon>
</Compile>
<Compile Include="PackagePane.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="PackagePane.Designer.cs">
<DependentUpon>PackagePane.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ResourcePane.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="ResourcePane.Designer.cs">
<DependentUpon>ResourcePane.cs</DependentUpon>
</Compile>
<Compile Include="VariableDumper.cs" />
<Compile Include="VirtualTexturesPane.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="VirtualTexturesPane.Designer.cs">
<DependentUpon>VirtualTexturesPane.cs</DependentUpon>
</Compile>
<EmbeddedResource Include="DebugPane.resx">
<DependentUpon>DebugPane.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ExportItemSelection.resx">
<DependentUpon>ExportItemSelection.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GR2Pane.resx">
<DependentUpon>GR2Pane.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="LocalizationPane.resx">
<DependentUpon>LocalizationPane.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="OsirisPane.resx">
<DependentUpon>OsirisPane.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="PackagePane.resx">
<DependentUpon>PackagePane.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<EmbeddedResource Include="ResourcePane.resx">
<DependentUpon>ResourcePane.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="VirtualTexturesPane.resx">
<DependentUpon>VirtualTexturesPane.cs</DependentUpon>
</EmbeddedResource>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<PackageReference Include="Newtonsoft.Json">
<Version>13.0.3</Version>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\LSLib\LSLib.csproj">
<Project>{46372c50-4288-4b8e-af21-c934560600e0}</Project>
Expand All @@ -202,36 +27,4 @@
<Name>OpenTK</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.5">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.5 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Service References\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
1 change: 0 additions & 1 deletion ConverterApp/MainForm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using Alphaleonis.Win32.Filesystem;
using System.Windows.Forms;
using LSLib.LS;
using LSLib.LS.Enums;
Expand Down
1 change: 0 additions & 1 deletion ConverterApp/PackagePane.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using System.Diagnostics;
using System.Windows.Forms;
using Alphaleonis.Win32.Filesystem;
using LSLib.LS;
using LSLib.LS.Enums;

Expand Down
35 changes: 0 additions & 35 deletions ConverterApp/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions ConverterApp/Properties/Resources.Designer.cs
View file
Open in desktop

This file was deleted.

Loading