Merge pull request #63062 from dotnet/dev/allichou/TryUpdateSDK2

Upgrade to .NET 7 P6 SDK
dotnet · Aug 8, 2022 · a9740c7 · a9740c7
2 parents 54aeea4 + 686810f
commit a9740c7
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -212,7 +212,7 @@
       is expected by the NET SDK used in the Workspace.MSBuild UnitTests. In order to test against the same verion of NuGet
       as our configured SDK, we must set the version to be the same.
      -->
-    <NuGetCommonVersion>6.3.0-preview.2.73</NuGetCommonVersion>
+    <NuGetCommonVersion>6.3.0-rc.104</NuGetCommonVersion>
     <NuGetConfigurationVersion>$(NuGetCommonVersion)</NuGetConfigurationVersion>
     <NuGetFrameworksVersion>$(NuGetCommonVersion)</NuGetFrameworksVersion>
     <NuGetPackagingVersion>$(NuGetCommonVersion)</NuGetPackagingVersion>

diff --git a/eng/targets/Imports.targets b/eng/targets/Imports.targets
@@ -358,6 +358,14 @@
            AlwaysCreate="true"
            Condition="'@(ReferencesCopiedInThisBuild)' != ''"/>
   </Target>
+
+  <!-- Workaround for https://github.com/dotnet/roslyn/issues/63189 -->
+  <Target Name="DisableJsonGenerator"
+           AfterTargets="ResolvePackageAssets">
+    <ItemGroup>
+      <ResolvedAnalyzers Remove="@(ResolvedAnalyzers)" Condition="'%(NuGetPackageId)' == 'System.Text.Json'" />
+    </ItemGroup>
+  </Target>
 
   <Import Project="DoNotDeployToSymStore_Workaround.targets" Condition="'$(UsingToolPdbConverter)' == 'false'" />
   <Import Project="DoNotGenerateSatelliteAssemblies_Workaround.targets" Condition="'$(GenerateSatelliteAssemblies)' == 'false'" />

diff --git a/global.json b/global.json
@@ -1,11 +1,11 @@
 {
   "sdk": {
-    "version": "7.0.100-preview.5.22307.18",
+    "version": "7.0.100-preview.6.22352.1",
     "allowPrerelease": true,
     "rollForward": "latestPatch"
   },
   "tools": {
-    "dotnet": "7.0.100-preview.5.22307.18",
+    "dotnet": "7.0.100-preview.6.22352.1",
     "runtimes": {
       "dotnet": [
         "3.1.0"

diff --git a/src/Compilers/VisualBasic/Test/Semantic/Semantics/CompoundAssignment.vb b/src/Compilers/VisualBasic/Test/Semantic/Semantics/CompoundAssignment.vb
@@ -1094,7 +1094,7 @@ End Class
 ]]>)
         End Sub
 
-        <Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
+        <Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
         Public Sub Bug1021941_01()
 
             Dim compilationDef =
@@ -1197,7 +1197,7 @@ Position set for item 'Bar'
 ]]>)
         End Sub
 
-        <Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
+        <Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
         Public Sub Bug1021941_02()
 
             Dim compilationDef =
@@ -1300,7 +1300,7 @@ Position set for item 'Bar'
 ]]>)
         End Sub
 
-        <Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
+        <Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
         Public Sub Bug1021941_03()
 
             Dim compilationDef =
@@ -1410,7 +1410,7 @@ Position set for item 'Bar'
 ]]>)
         End Sub
 
-        <Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
+        <Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
         Public Sub Bug1021941_04()
 
             Dim compilationDef =
@@ -1535,7 +1535,7 @@ Position set for item 'Bar'
 ]]>)
         End Sub
 
-        <Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
+        <Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
         Public Sub Bug1021941_05()
 
             Dim compilationDef =
@@ -1652,7 +1652,7 @@ Position set for item 'Bar'
 ]]>)
         End Sub
 
-        <Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
+        <Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
         Public Sub Bug1021941_06()
 
             Dim compilationDef =
@@ -1759,7 +1759,7 @@ Position set for item 'Bar'
 ]]>)
         End Sub
 
-        <Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
+        <Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
         Public Sub Bug1021941_07()
 
             Dim compilationDef =
@@ -1862,7 +1862,7 @@ Position set for item 'Bar'
 ]]>)
         End Sub
 
-        <Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
+        <Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
         Public Sub Bug1021941_08()
 
             Dim compilationDef =
@@ -1965,7 +1965,7 @@ Position set for item 'Bar'
 ]]>)
         End Sub
 
-        <Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
+        <Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
         Public Sub Bug1021941_09()
 
             Dim compilationDef =
@@ -2075,7 +2075,7 @@ Position set for item 'Bar'
 ]]>)
         End Sub
 
-        <Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
+        <Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
         Public Sub Bug1021941_10()
 
             Dim compilationDef =
@@ -2200,7 +2200,7 @@ Position set for item 'Bar'
 ]]>)
         End Sub
 
-        <Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
+        <Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
         Public Sub Bug1021941_11()
 
             Dim compilationDef =
@@ -2317,7 +2317,7 @@ Position set for item 'Bar'
 ]]>)
         End Sub
 
-        <Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
+        <Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
         Public Sub Bug1021941_12()
 
             Dim compilationDef =