Update .NET SDK to 7.0.200 (microsoft#35)

vmoroz · Mar 2, 2023 · aa7327f · aa7327f
1 parent b478a19
commit aa7327f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,15 +3,15 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.Build" Version="17.4.0" />
+    <PackageVersion Include="Microsoft.Build" Version="17.5.0" />
     <PackageVersion Include="Microsoft.Build.Locator" Version="1.5.5" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageVersion Include="Nerdbank.GitVersioning" Version="3.5.119" />
     <PackageVersion Include="System.Reflection.MetadataLoadContext" Version="7.0.0" />
     <PackageVersion Include="xunit" Version="2.4.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
     <PackageVersion Include="NuGet.Frameworks" Version="6.4.0" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/Test/NodeApi.Test.csproj b/Test/NodeApi.Test.csproj
@@ -26,4 +26,15 @@
     <ProjectReference Include="..\Runtime\NodeApi.Runtime.csproj" />
   </ItemGroup>
 
+  <!--
+    Work around MSBuild.Locator NuGet.Frameworks version conflict.
+    https://github.com/microsoft/MSBuildLocator/issues/127
+    https://github.com/dotnet/roslyn/issues/61454
+  -->
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Copy SourceFiles="$([System.IO.Directory]::GetParent($(BundledRuntimeIdentifierGraphFile)))\NuGet.Frameworks.dll"
+          DestinationFolder="$(OutputPath)"
+          ContinueOnError="false" />
+  </Target>
+
 </Project>
diff --git a/Test/TestBuilder.cs b/Test/TestBuilder.cs
@@ -38,7 +38,6 @@ private static void InitializeMsbuild()
                 MSBuildLocator.QueryVisualStudioInstances().ToArray();
             VisualStudioInstance msbuildInstance = msbuildInstances
                 .Where((instance) => instance.Version.Major == Environment.Version.Major &&
-                    instance.Version.Build < 200 &&
                     !instance.MSBuildPath.Contains("preview"))
                 .OrderByDescending(instance => instance.Version)
                 .First();

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100",
+    "version": "7.0.200",
     "rollForward": "latestPatch"
   }
 }