Skip to content

Commit 39552eb

Browse files
dibarbetdibarbet
committed
Merge pull request #63062 from dotnet/dev/allichou/TryUpdateSDK2
Upgrade to .NET 7 P6 SDK
1 parent 7749c2f commit 39552eb

File tree

4 files changed

+26
-15
lines changed

4 files changed

+26
-15
lines changed

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
is expected by the NET SDK used in the Workspace.MSBuild UnitTests. In order to test against the same verion of NuGet
213213
as our configured SDK, we must set the version to be the same.
214214
-->
215-
<NuGetCommonVersion>6.3.0-preview.1.32</NuGetCommonVersion>
215+
<NuGetCommonVersion>6.3.0-rc.104</NuGetCommonVersion>
216216
<NuGetConfigurationVersion>$(NuGetCommonVersion)</NuGetConfigurationVersion>
217217
<NuGetFrameworksVersion>$(NuGetCommonVersion)</NuGetFrameworksVersion>
218218
<NuGetPackagingVersion>$(NuGetCommonVersion)</NuGetPackagingVersion>

‎eng/targets/Imports.targets‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,4 +358,15 @@
358358
AlwaysCreate="true"
359359
Condition="'@(ReferencesCopiedInThisBuild)' != ''"/>
360360
</Target>
361+
362+
<!-- Workaround for https://github.com/dotnet/roslyn/issues/63189 -->
363+
<Target Name="DisableJsonGenerator"
364+
AfterTargets="ResolvePackageAssets">
365+
<ItemGroup>
366+
<ResolvedAnalyzers Remove="@(ResolvedAnalyzers)" Condition="'%(NuGetPackageId)' == 'System.Text.Json'" />
367+
</ItemGroup>
368+
</Target>
369+
370+
<Import Project="DoNotDeployToSymStore_Workaround.targets" Condition="'$(UsingToolPdbConverter)' == 'false'" />
371+
<Import Project="DoNotGenerateSatelliteAssemblies_Workaround.targets" Condition="'$(GenerateSatelliteAssemblies)' == 'false'" />
361372
</Project>

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"sdk": {
3-
"version": "7.0.100-preview.4.22252.9",
3+
"version": "7.0.100-preview.6.22352.1",
44
"allowPrerelease": true,
55
"rollForward": "latestPatch"
66
},
77
"tools": {
8-
"dotnet": "7.0.100-preview.4.22252.9",
8+
"dotnet": "7.0.100-preview.6.22352.1",
99
"runtimes": {
1010
"dotnet": [
1111
"3.1.0"

‎src/Compilers/VisualBasic/Test/Semantic/Semantics/CompoundAssignment.vb‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,7 @@ End Class
10941094
]]>)
10951095
End Sub
10961096

1097-
<Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
1097+
<Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
10981098
Public Sub Bug1021941_01()
10991099

11001100
Dim compilationDef =
@@ -1197,7 +1197,7 @@ Position set for item 'Bar'
11971197
]]>)
11981198
End Sub
11991199

1200-
<Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
1200+
<Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
12011201
Public Sub Bug1021941_02()
12021202

12031203
Dim compilationDef =
@@ -1300,7 +1300,7 @@ Position set for item 'Bar'
13001300
]]>)
13011301
End Sub
13021302

1303-
<Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
1303+
<Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
13041304
Public Sub Bug1021941_03()
13051305

13061306
Dim compilationDef =
@@ -1410,7 +1410,7 @@ Position set for item 'Bar'
14101410
]]>)
14111411
End Sub
14121412

1413-
<Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
1413+
<Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
14141414
Public Sub Bug1021941_04()
14151415

14161416
Dim compilationDef =
@@ -1535,7 +1535,7 @@ Position set for item 'Bar'
15351535
]]>)
15361536
End Sub
15371537

1538-
<Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
1538+
<Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
15391539
Public Sub Bug1021941_05()
15401540

15411541
Dim compilationDef =
@@ -1652,7 +1652,7 @@ Position set for item 'Bar'
16521652
]]>)
16531653
End Sub
16541654

1655-
<Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
1655+
<Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
16561656
Public Sub Bug1021941_06()
16571657

16581658
Dim compilationDef =
@@ -1759,7 +1759,7 @@ Position set for item 'Bar'
17591759
]]>)
17601760
End Sub
17611761

1762-
<Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
1762+
<Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
17631763
Public Sub Bug1021941_07()
17641764

17651765
Dim compilationDef =
@@ -1862,7 +1862,7 @@ Position set for item 'Bar'
18621862
]]>)
18631863
End Sub
18641864

1865-
<Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
1865+
<Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
18661866
Public Sub Bug1021941_08()
18671867

18681868
Dim compilationDef =
@@ -1965,7 +1965,7 @@ Position set for item 'Bar'
19651965
]]>)
19661966
End Sub
19671967

1968-
<Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
1968+
<Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
19691969
Public Sub Bug1021941_09()
19701970

19711971
Dim compilationDef =
@@ -2075,7 +2075,7 @@ Position set for item 'Bar'
20752075
]]>)
20762076
End Sub
20772077

2078-
<Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
2078+
<Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
20792079
Public Sub Bug1021941_10()
20802080

20812081
Dim compilationDef =
@@ -2200,7 +2200,7 @@ Position set for item 'Bar'
22002200
]]>)
22012201
End Sub
22022202

2203-
<Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
2203+
<Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
22042204
Public Sub Bug1021941_11()
22052205

22062206
Dim compilationDef =
@@ -2317,7 +2317,7 @@ Position set for item 'Bar'
23172317
]]>)
23182318
End Sub
23192319

2320-
<Fact(), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
2320+
<Fact(Skip:="https://github.com/dotnet/roslyn/issues/63221"), WorkItem(1021941, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1021941")>
23212321
Public Sub Bug1021941_12()
23222322

23232323
Dim compilationDef =

0 commit comments

Comments
 (0)