Skip to content

Upgrade to .NET 7 P6 SDK #63062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 8, 2022
Merged

Upgrade to .NET 7 P6 SDK #63062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e87841e
Upgrade to .NET 7 P6 SDK
allisonchou Jul 29, 2022
b00a59d
Update nuget version
allisonchou Jul 30, 2022
b8c53e1
Temporary workaround to disable duplicate generators
chsienki Aug 3, 2022
686810f
Disable 12 tests for CompoundAssignment.Bug1021941
dibarbet Aug 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 8 additions & 0 deletions eng/targets/Imports.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'" />
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
24 changes: 12 additions & 12 deletions src/Compilers/VisualBasic/Test/Semantic/Semantics/CompoundAssignment.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -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 =
Expand Down Expand Up @@ -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 =
Expand Down Expand Up @@ -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 =
Expand Down Expand Up @@ -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 =
Expand Down Expand Up @@ -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 =
Expand Down Expand Up @@ -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 =
Expand Down Expand Up @@ -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 =
Expand Down Expand Up @@ -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 =
Expand Down Expand Up @@ -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 =
Expand Down Expand Up @@ -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 =
Expand Down Expand Up @@ -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 =
Expand Down