Convert project to new sdk style

AndrasteFramework · Nov 26, 2023 · 591dc62 · 591dc62
1 parent b65b18e
commit 591dc62
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 150 deletions.
diff --git a/.github/workflows/netfx.yml b/.github/workflows/netfx.yml
@@ -15,15 +15,9 @@ jobs:
     # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
     - name: Setup MSBuild.exe
       uses: microsoft/[email protected]
-
-    - name: Restore NuGet Packages
-      run: nuget restore Andraste.Shared/Andraste.Shared.csproj -PackagesDirectory packages
 
     - name: Build project
-      run: msbuild Andraste.Shared/Andraste.Shared.csproj /p:Configuration=Release
-
-    - name: Build NuGet Package
-      run: nuget pack Andraste.Shared/Andraste.Shared.csproj -PackagesDirectory packages -Prop Configuration=Release
+      run: msbuild Andraste.Shared/Andraste.Shared.csproj /p:Configuration=Release /p:GeneratePackageOnBuild=true
 
     - name: Upload Artifact
       uses: actions/upload-artifact@v3
@@ -32,4 +26,8 @@ jobs:
         path: |
           Andraste.Shared\bin\Release\Andraste.Shared.dll
           Andraste.Shared\bin\Release\Andraste.Shared.pdb
-          Andraste.Shared.*.nupkg
+    - name: Upload NuPkg
+      uses: actions/upload-artifact@v3
+      with:
+        name: NuGet
+        path: bin\Release\Andraste.Shared.*.nupkg
diff --git a/Andraste.Shared.csproj b/Andraste.Shared.csproj
@@ -1,111 +1,48 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.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')" />
-<PropertyGroup>
-  <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-  <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-  <OutputType>Library</OutputType>
-  <AppDesignerFolder>Properties</AppDesignerFolder>
-  <RootNamespace>Andraste.Shared</RootNamespace>
-  <AssemblyName>Andraste.Shared</AssemblyName>
-  <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-  <FileAlignment>512</FileAlignment>
-  <LangVersion>8</LangVersion>
-</PropertyGroup>
-<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  <PlatformTarget>AnyCPU</PlatformTarget>
-  <DebugSymbols>true</DebugSymbols>
-  <DebugType>full</DebugType>
-  <Optimize>false</Optimize>
-  <OutputPath>bin\Debug\</OutputPath>
-  <DefineConstants>DEBUG;TRACE</DefineConstants>
-  <ErrorReport>prompt</ErrorReport>
-  <WarningLevel>4</WarningLevel>
-  <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-</PropertyGroup>
-<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  <PlatformTarget>AnyCPU</PlatformTarget>
-  <DebugType>pdbonly</DebugType>
-  <Optimize>true</Optimize>
-  <OutputPath>bin\Release\</OutputPath>
-  <DefineConstants>TRACE</DefineConstants>
-  <ErrorReport>prompt</ErrorReport>
-  <WarningLevel>4</WarningLevel>
-  <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-</PropertyGroup>
-<ItemGroup>
-  <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-    <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0-preview.4.22229.4\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-  </Reference>
-  <Reference Include="Microsoft.CSharp" />
-  <Reference Include="mscorlib" />
-  <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-    <HintPath>..\packages\NLog.4.7.13\lib\net45\NLog.dll</HintPath>
-    <Private>True</Private>
-  </Reference>
-  <Reference Include="System" />
-  <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-    <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
-  </Reference>
-  <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-    <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
-  </Reference>
-  <Reference Include="System.Numerics" />
-  <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-    <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
-  </Reference>
-  <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-    <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-  </Reference>
-  <Reference Include="System.Text.Encodings.Web, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-    <HintPath>..\packages\System.Text.Encodings.Web.7.0.0-preview.4.22229.4\lib\net462\System.Text.Encodings.Web.dll</HintPath>
-  </Reference>
-  <Reference Include="System.Text.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-    <HintPath>..\packages\System.Text.Json.6.0.0\lib\net461\System.Text.Json.dll</HintPath>
-  </Reference>
-  <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-    <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-  </Reference>
-  <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-    <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
-  </Reference>
-</ItemGroup>
-<ItemGroup>
-  <Compile Include="Lifecycle\IManager.cs" />
-  <Compile Include="Lifecycle\ManagerContainer.cs" />
-  <Compile Include="ModManagement\EnabledMod.cs" />
-  <Compile Include="ModManagement\Json\Features\IFeatureParser.cs" />
-  <Compile Include="ModManagement\Json\Features\Plugin\BuiltinPluginFeature.cs" />
-  <Compile Include="ModManagement\Json\Features\Plugin\PluginFeatureParser.cs" />
-  <Compile Include="ModManagement\Json\Features\Vfs\BuiltinVfsFeature.cs" />
-  <Compile Include="ModManagement\Json\Features\Vfs\VFSFeatureParser.cs" />
-  <Compile Include="ModManagement\Json\ModInformation.cs" />
-  <Compile Include="ModManagement\Json\ModSettings.cs" />
-  <Compile Include="ModManagement\ModInformationParser.cs" />
-  <Compile Include="ModManagement\PotentialModEnumerator.cs" />
-</ItemGroup>
-<ItemGroup>
-  <None Include="App.config" />
-  <None Include="packages.config" />
-</ItemGroup>
-<ItemGroup>
-  <Content Include="Andraste.Shared.nuspec" />
-  <Content Include="README.md" />
-</ItemGroup>
-<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-<Import Project="..\packages\System.Text.Json.6.0.0\build\System.Text.Json.targets" Condition="Exists('..\packages\System.Text.Json.6.0.0\build\System.Text.Json.targets')" />
-<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
+    <TargetFramework>net48</TargetFramework>
+    <LangVersion>8</LangVersion>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <Title>Andraste Shared</Title>
+    <Authors>MeFisto94</Authors>
+    <PackageId>Andraste.Shared</PackageId>
+    <PackageVersion>0.1.4</PackageVersion>
+    <PackageProjectUrl>https://AndrasteFramework.github.io</PackageProjectUrl>
+    <!-- <icon>icon.png</icon> -->
+    <Description>The shared functionality (Host and Payload) of Andraste. Mostly consisting of utility classes and interfaces</Description>
+    <Copyright>Copyright 2023 The AndrasteFramework Team</Copyright>
+    <RepositoryUrl>https://github.com/AndrasteFramework/Shared</RepositoryUrl>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <RepositoryType>git</RepositoryType>
+    <PackageTags>Andraste ModdingFramework</PackageTags>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
-  <Error Condition="!Exists('..\packages\System.Text.Json.6.0.0\build\System.Text.Json.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Text.Json.6.0.0\build\System.Text.Json.targets'))" />
-</Target>
-<!-- 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>
--->
-
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0-preview.4.22229.4" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="System.Buffers" Version="4.5.1" />
+    <PackageReference Include="System.Memory" Version="4.5.4" />
+    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.4.22229.4" />
+    <PackageReference Include="System.Text.Json" Version="6.0.0" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="NLog" Version="4.7.13" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="mscorlib" />
+    <Reference Include="System.Runtime.Remoting" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="README.md" />
+  </ItemGroup>
 </Project>
diff --git a/Andraste.Shared.nuspec b/Andraste.Shared.nuspec
diff --git a/packages.config b/packages.config