upgrade refs (#2)

* upgrade refs * update
huoshan12345 · Oct 2, 2024 · ede6478 · ede6478
1 parent 525a88a
commit ede6478
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 27 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,14 +19,15 @@ jobs:
  runs-on: windows-2019
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
 
  - name: Setup dotnet
- uses: actions/setup-dotnet@v3
+ uses: actions/setup-dotnet@v4
  with:
  dotnet-version: | 
  6.0.x
  7.0.x
+ 8.0.x
 
  - name: Restore
  run: dotnet restore ${{ env.SOLUTION }} -v q

diff --git a/build/pkg.version b/build/pkg.version
@@ -1 +1 @@
-0.1.6
+0.1.7
diff --git a/src/MixedIL.Example.FSharp/MixedIL.Example.FSharp.fsproj b/src/MixedIL.Example.FSharp/MixedIL.Example.FSharp.fsproj
@@ -8,7 +8,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Fody" Version="6.8.0" PrivateAssets="all" />
+ <PackageReference Include="Fody" Version="6.8.2" PrivateAssets="all" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/src/MixedIL.Example/FodyWeavers.xml b/src/MixedIL.Example/FodyWeavers.xml
@@ -1,3 +1,3 @@
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
  <MixedIL />
-</Weavers>
+</Weavers>
diff --git a/src/MixedIL.Example/MixedIL.Example.csproj b/src/MixedIL.Example/MixedIL.Example.csproj
@@ -8,7 +8,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Fody" Version="6.8.0" PrivateAssets="all" />
+ <PackageReference Include="Fody" Version="6.8.2" PrivateAssets="all" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/src/MixedIL.Fody/GlobalUsings.cs b/src/MixedIL.Fody/GlobalUsings.cs
@@ -8,4 +8,5 @@
 global using System.Reflection;
 global using Mono.Cecil;
 global using Mono.Cecil.Cil;
-global using MoreFodyHelpers.Extensions;
+global using MoreFodyHelpers.Extensions;
+global using MoreFodyHelpers.Support;
diff --git a/src/MixedIL.Fody/MixedIL.Fody.csproj b/src/MixedIL.Fody/MixedIL.Fody.csproj
@@ -9,11 +9,8 @@
  <RootNamespace></RootNamespace>
  </PropertyGroup>
  <ItemGroup>
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
  <PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" />
- <PackageReference Include="MoreFodyHelpers" Version="0.0.5" GeneratePathProperty="true" />
- <None Include="$(PkgMoreFodyHelpers)\lib\$(TargetFramework)\MoreFodyHelpers.dll" Visible="false">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
+ <PackageReference Include="MoreFodyHelpers" Version="0.0.8" GeneratePathProperty="true" />
  </ItemGroup>
 </Project>
diff --git a/src/MixedIL.Fody/MixedIL.Fody/LocalReferenceModuleResolver.cs b/src/MixedIL.Fody/MixedIL.Fody/LocalReferenceModuleResolver.cs
@@ -1,5 +1,4 @@
 using FodyTools;
-using MoreFodyHelpers;
 
 namespace MixedIL.Fody;
 

diff --git a/src/MixedIL.Unsafe/MixedIL.Unsafe.csproj b/src/MixedIL.Unsafe/MixedIL.Unsafe.csproj
@@ -8,7 +8,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Fody" Version="6.8.0" PrivateAssets="all" />
+ <PackageReference Include="Fody" Version="6.8.2" PrivateAssets="all" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/src/MixedIL/MixedIL.csproj b/src/MixedIL/MixedIL.csproj
@@ -11,17 +11,15 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Fody" Version="6.8.0" PrivateAssets="none" />
- <PackageReference Include="FodyPackaging" Version="6.8.0" PrivateAssets="All" />
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
+ <PackageReference Include="Fody" Version="6.8.2" PrivateAssets="none" />
+ <PackageReference Include="FodyPackaging" Version="6.8.2" PrivateAssets="All" />
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
  </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="..\MixedIL.Fody\MixedIL.Fody.csproj" PrivateAssets="All" />
  </ItemGroup>
 
  <ItemGroup Label="FilesToCopy">
- <Content Include="System\Runtime\CompilerServices\IgnoresAccessChecksToAttribute.fs" Pack="true" BuildAction="None" PackagePath="content\" />
- <Content Include="System\Runtime\CompilerServices\IgnoresAccessChecksToAttribute.cs" Pack="true" BuildAction="None" PackagePath="content\" />
  <Content Include="MixedIL.targets" Pack="true" BuildAction="None" PackagePath="build\MixedIL.Fody.targets" />
  </ItemGroup>
 

diff --git a/test/MixedIL.Tests.AssemblyToProcess/MixedIL.Tests.AssemblyToProcess.csproj b/test/MixedIL.Tests.AssemblyToProcess/MixedIL.Tests.AssemblyToProcess.csproj
@@ -13,7 +13,7 @@
 
  <ItemGroup>
  <ProjectReference Include="..\..\src\MixedIL\MixedIL.csproj" />
- <PackageReference Include="xunit" Version="2.5.2" />
+ <PackageReference Include="xunit" Version="2.9.2" />
  </ItemGroup>
 
 </Project>
diff --git a/test/MixedIL.Tests.StandardAssemblyToProcess/MixedIL.Tests.StandardAssemblyToProcess.csproj b/test/MixedIL.Tests.StandardAssemblyToProcess/MixedIL.Tests.StandardAssemblyToProcess.csproj
@@ -23,7 +23,7 @@
 
  <ItemGroup>
  <ProjectReference Include="..\..\src\MixedIL\MixedIL.csproj" />
- <PackageReference Include="xunit" Version="2.5.3" />
+ <PackageReference Include="xunit" Version="2.9.2" />
  </ItemGroup>
 </Project>
 
diff --git a/test/MixedIL.Tests/MixedIL.Tests.csproj b/test/MixedIL.Tests/MixedIL.Tests.csproj
@@ -7,9 +7,9 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
- <PackageReference Include="xunit" Version="2.5.3" />
- <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" PrivateAssets="All" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+ <PackageReference Include="xunit" Version="2.9.2" />
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="All" />
  </ItemGroup>
 
  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">

diff --git a/test/MixedIL.Unsafe.Tests/MixedIL.Unsafe.Tests.csproj b/test/MixedIL.Unsafe.Tests/MixedIL.Unsafe.Tests.csproj
@@ -10,9 +10,9 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
- <PackageReference Include="xunit" Version="2.5.2" />
- <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" PrivateAssets="All" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+ <PackageReference Include="xunit" Version="2.9.2" />
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="All" />
  </ItemGroup>
 
  <ItemGroup>