Resolve source-build patch conflict

2022-09-19 20:52:05 +00:00 · 2022-09-19 20:52:05 +00:00 · 5a1ce7b8fa
commit 5a1ce7b8fa
parent 9b82c9ad62
1 changed files with 3 additions and 3 deletions
--- a/src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch
+++ b/src/SourceBuild/tarball/patches/msbuild/0001-Change-TargetFramework-to-net7.0.patch
@ -88,11 +88,11 @@ index 471f88dbc..efd25efd1 100644
     "allowPrerelease": true
   },
   "tools": {
-    "dotnet": "6.0.200",
+-    "dotnet": "6.0.401",
 +    "dotnet": "7.0.100-preview.5.22307.18",
     "vs": {
-       "version": "17.0"
-     }
+       "version": "17.2.1"
+     },
 diff --git a/scripts/Deploy-MSBuild.ps1 b/scripts/Deploy-MSBuild.ps1
 index ef1959fc3..8cfecb6a0 100644
 --- a/scripts/Deploy-MSBuild.ps1