diff --git a/Directory.Build.props b/Directory.Build.props index 056da42..91ab9d6 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -3,6 +3,7 @@ true false + true latest Enable true @@ -12,6 +13,7 @@ true git https://github.com/kekyo/ILCompose.git + False ILCompose ILCompose @@ -25,7 +27,7 @@ ILCompose.100.png ilasm;compose;mixin;ilsupport;inline-asm;cil;msil .pdb - $(NoWarn);NU1605;NU1701;NU1803;NU1503;CA1416 + $(NoWarn);NU1503;NU1605;NU1701;NU1803;NU1902;NU1903;CA1416 @@ -40,10 +42,12 @@ true true true + $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)')) + $(RepoRoot)=. - + diff --git a/ILCompose/ILCompose.csproj b/ILCompose/ILCompose.csproj index ba08c8a..00358b7 100644 --- a/ILCompose/ILCompose.csproj +++ b/ILCompose/ILCompose.csproj @@ -2,24 +2,29 @@ Exe - net462;netcoreapp2.2;netcoreapp3.1;net5.0;net6.0;net7.0 + net462;netcoreapp2.2;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0 ilcompose true true $(NoWarn);CS1591 + True ILCompose.nuspec true false + + Minor + + - + diff --git a/ILCompose/ILCompose.nuspec b/ILCompose/ILCompose.nuspec index b0c3252..958daff 100644 --- a/ILCompose/ILCompose.nuspec +++ b/ILCompose/ILCompose.nuspec @@ -16,7 +16,7 @@ true - + @@ -29,5 +29,6 @@ + diff --git a/PlayGround/ILCompose.Sample/ILCompose.Sample.csproj b/PlayGround/ILCompose.Sample/ILCompose.Sample.csproj index 11ade37..1cabe3c 100644 --- a/PlayGround/ILCompose.Sample/ILCompose.Sample.csproj +++ b/PlayGround/ILCompose.Sample/ILCompose.Sample.csproj @@ -27,7 +27,7 @@ - + diff --git a/PlayGround/ILCompose.UnitTestSample/ILCompose.UnitTestSample.csproj b/PlayGround/ILCompose.UnitTestSample/ILCompose.UnitTestSample.csproj index c6b5155..3f1e71c 100644 --- a/PlayGround/ILCompose.UnitTestSample/ILCompose.UnitTestSample.csproj +++ b/PlayGround/ILCompose.UnitTestSample/ILCompose.UnitTestSample.csproj @@ -1,9 +1,9 @@ - + - net48;net6.0;net7.0 + net48;net6.0;net7.0;net8.0 latest enable portable @@ -17,10 +17,10 @@ - + - - + + diff --git a/README.md b/README.md index 71eb11b..2342259 100644 --- a/README.md +++ b/README.md @@ -60,14 +60,14 @@ Only you have to do install the NuGet package [ILCompose](https://www.nuget.org/ Supported target platforms: -* .NET 7, 6, 5 +* .NET 8, 7, 6, 5 * .NET Core 3.1 to 2.0 (maybe to 1.0) * .NET Standard 2.1, 2.0 (maybe to 1.0) * .NET Framework 4.8 to 2.0 (maybe to 1.0) Supported building platforms: -* dotnet SDK 7, 6, 5, 3.1, 2.2 and 2.1 (on Windows and Linux) +* dotnet SDK 8, 7, 6, 5, 3.1, 2.2 and 2.1 (on Windows and Linux) * .NET Framework 4.8 to 4.6.2 on Windows (With dotnet SDK installation) ---- diff --git a/build-nupkg.bat b/build-nupkg.bat index cd07383..46d730d 100644 --- a/build-nupkg.bat +++ b/build-nupkg.bat @@ -12,5 +12,5 @@ echo. rem git clean -xfd -dotnet restore -dotnet pack -p:Configuration=Release -p:Platform=AnyCPU -o artifacts ILCompose\ILCompose.csproj +dotnet build -p:Configuration=Release -p:Platform="Any CPU" -p:RestoreNoCache=True ILCompose.sln +dotnet pack -p:Configuration=Release -p:Platform="Any CPU" -o artifacts ILCompose.sln diff --git a/build-nupkg.sh b/build-nupkg.sh index 15c32f4..52b81db 100644 --- a/build-nupkg.sh +++ b/build-nupkg.sh @@ -12,5 +12,5 @@ echo "" # git clean -xfd -dotnet restore -dotnet pack -p:Configuration=Release -p:Platform=AnyCPU -o artifacts ILCompose/ILCompose.csproj +dotnet build -p:Configuration=Release -p:Platform="Any CPU" -p:RestoreNoCache=True ILCompose.sln +dotnet pack -p:Configuration=Release -p:Platform="Any CPU" -o artifacts ILCompose.sln diff --git a/samples/ILCompose.Sample/ILCompose.Sample.csproj b/samples/ILCompose.Sample/ILCompose.Sample.csproj index 6d254ab..2cf847e 100644 --- a/samples/ILCompose.Sample/ILCompose.Sample.csproj +++ b/samples/ILCompose.Sample/ILCompose.Sample.csproj @@ -4,6 +4,7 @@ net40;netstandard2.0 latest enable + False