Skip to content
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

Upgrade SDK to 6.0.100-rc.1.21411.13 #57143

Merged
merged 12 commits into from
Aug 12, 2021
Merged

Upgrade SDK to 6.0.100-rc.1.21411.13 #57143

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
043a5e3
Upgrade SDK to 6.0.100-rc.1.21379.2
ViktorHofer Aug 10, 2021
dc94950
set StaticWebAssetsEnabled=false
lewing Aug 10, 2021
cf597f1
Remove IsSupported2 since asserting it is true when it might not be
lewing Aug 11, 2021
dc42abc
Try enabling the runtimeconfig generator everywhere
lewing Aug 11, 2021
55674cf
Revert part of runtimeconfig parser change
lewing Aug 11, 2021
a9b4686
Fix System.Text.Json tests to run with trimming by setting MetadataUp…
eerhardt Aug 11, 2021
bfaa2f7
Disable bundling tests on Mac due to bug
agocke Aug 11, 2021
4f83413
Make ProcessInfo tests resilient to RuntimeConfig switches on command…
Aug 11, 2021
cb336a0
Update global.json
danmoseley Aug 12, 2021
d93e250
Update to latest SDK.
eerhardt Aug 12, 2021
6b50bfb
ignore runtimeconfig switches _if_ they show up
Aug 12, 2021
df6f5e2
Remove test which uses `dotnet run, which is SDK-specific
agocke Aug 12, 2021
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
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": "6.0.100-preview.6.21355.2",
"version": "6.0.100-rc.1.21379.2",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "6.0.100-preview.6.21355.2"
"dotnet": "6.0.100-rc.1.21379.2"
},
"native-tools": {
"cmake": "3.16.4",
Expand Down
1 change: 1 addition & 0 deletions src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
<OutputType>Exe</OutputType>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#57143 (comment)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @javiercn

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lewing thanks for the heads up. It's fixed in dotnet/sdk#19482

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it's fixed in the SDK do we need to remove these now?

Copy link
Member

@lewing lewing Aug 14, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, I'll revert the workarounds

</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/libraries/Common/tests/System/Net/Prerequisites/RemoteLoopServer/RemoteLoopServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<TargetFramework>$(AspNetCoreAppCurrent)</TargetFramework>
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
<OutputType>Exe</OutputType>
<StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpStress.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<TargetFramework>net6.0</TargetFramework>
<LangVersion>preview</LangVersion>
<Nullable>enable</Nullable>
<StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/mono/wasm/debugger/BrowserDebugHost/BrowserDebugHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
<TargetFramework>$(AspNetCoreAppCurrent)</TargetFramework>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<NoWarn>$(NoWarn),CA2007</NoWarn>
Expand Down