Merge branch 'develop' into main

kekyo · Oct 23, 2023 · a347740 · a347740
2 parents bb15c7e + 00a3a6e
commit a347740
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 17 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
+    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     <LangVersion>latest</LangVersion>
     <Nullable>Enable</Nullable>
     <DebugSymbols>true</DebugSymbols>
@@ -12,6 +13,7 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/kekyo/ILCompose.git</RepositoryUrl>
+    <IsPackable>False</IsPackable>
 
     <Product>ILCompose</Product>
     <Trademark>ILCompose</Trademark>
@@ -25,7 +27,7 @@
     <PackageIcon>ILCompose.100.png</PackageIcon>
     <PackageTags>ilasm;compose;mixin;ilsupport;inline-asm;cil;msil</PackageTags>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <NoWarn>$(NoWarn);NU1605;NU1701;NU1803;NU1503;CA1416</NoWarn>
+    <NoWarn>$(NoWarn);NU1503;NU1605;NU1701;NU1803;NU1902;NU1903;CA1416</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' != 'Release'">
@@ -40,10 +42,12 @@
     <Deterministic>true</Deterministic>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <RepoRoot>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))</RepoRoot>
+    <PathMap>$(RepoRoot)=.</PathMap>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RelaxVersioner" Version="2.14.0" PrivateAssets="All" />
+    <PackageReference Include="RelaxVersioner" Version="3.2.40" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)' == 'Release'">

diff --git a/ILCompose/ILCompose.csproj b/ILCompose/ILCompose.csproj
@@ -2,24 +2,29 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net462;netcoreapp2.2;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net462;netcoreapp2.2;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <AssemblyName>ilcompose</AssemblyName>
 
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
 
+    <IsPackable>True</IsPackable>
     <NuspecFile>ILCompose.nuspec</NuspecFile>
     <NoPackageAnalysis>true</NoPackageAnalysis>
     <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
 
+  <PropertyGroup Condition="('$(TargetFramework)' == 'netcoreapp3.1') OR ('$(TargetFramework)' == 'net5.0') OR ('$(TargetFramework)' == 'net6.0') OR ('$(TargetFramework)' == 'net7.0') OR ('$(TargetFramework)' == 'net8.0')">
+    <RollForward>Minor</RollForward>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
-    <PackageReference Include="Mono.Cecil" Version="0.11.4" />
+    <PackageReference Include="Mono.Cecil" Version="0.11.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/ILCompose/ILCompose.nuspec b/ILCompose/ILCompose.nuspec
@@ -16,7 +16,7 @@
     <repository type="git" url="https://github.com/kekyo/ILCompose.git" branch="$RepositoryBranch$" commit="$RepositoryCommit$" />
     <developmentDependency>true</developmentDependency>
     <dependencies>
-      <dependency id="ILAsm.Managed" version="1.0.0" />
+      <dependency id="ILAsm.Managed" version="1.1.9" />
     </dependencies>
   </metadata>
   <files>
@@ -29,5 +29,6 @@
     <file src="bin\$Configuration$\net5.0\*.*" target="tools/net5.0" />
     <file src="bin\$Configuration$\net6.0\*.*" target="tools/net6.0" />
     <file src="bin\$Configuration$\net7.0\*.*" target="tools/net7.0" />
+    <file src="bin\$Configuration$\net8.0\*.*" target="tools/net8.0" />
   </files>
 </package>
diff --git a/PlayGround/ILCompose.Sample/ILCompose.Sample.csproj b/PlayGround/ILCompose.Sample/ILCompose.Sample.csproj
@@ -27,7 +27,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
-    <PackageReference Include="ILAsm.Managed" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="ILAsm.Managed" Version="1.1.9" PrivateAssets="All" />
   </ItemGroup>
 
   <Import Project="..\..\ILCompose\build\ILCompose.targets" />

diff --git a/PlayGround/ILCompose.UnitTestSample/ILCompose.UnitTestSample.csproj b/PlayGround/ILCompose.UnitTestSample/ILCompose.UnitTestSample.csproj
@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\ILCompose\build\ILCompose.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net7.0;net8.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <DebugType>portable</DebugType>
@@ -17,10 +17,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <packagereference Include="NUnit3TestAdapter" Version="4.3.1" PrivateAssets="All" />
-    <PackageReference Include="ILAsm.Managed" Version="1.0.0" PrivateAssets="All" />
+    <packagereference Include="NUnit3TestAdapter" Version="4.5.0" PrivateAssets="All" />
+    <PackageReference Include="ILAsm.Managed" Version="1.1.9" PrivateAssets="All" />
   </ItemGroup>
 
   <Import Project="..\..\ILCompose\build\ILCompose.targets" />

diff --git 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
@@ -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
@@ -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
@@ -4,6 +4,7 @@
     <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
+    <IsPackable>False</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>