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

Jump to bottom

Update SDK to 6.0 RC2 #60256

Merged
merged 8 commits into from
Nov 3, 2021
Merged

Update SDK to 6.0 RC2 #60256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2c2a8d1
Update SDK to 6.0 RC2
ViktorHofer Oct 11, 2021
b9745df
Update global.json
ViktorHofer Oct 12, 2021
659b212
Update global.json
ViktorHofer Oct 12, 2021
9ad38ed
Disable targetting pack caching as we update the targetting pack duri…
jkoritzinsky Oct 21, 2021
517e8dd
Apply suggestions from code review
jkoritzinsky Oct 21, 2021
41379f0
Update the compiler toolset package to match the version of the compi…
jkoritzinsky Oct 22, 2021
700256d
Merge branch 'main' into ViktorHofer-sdk-update-6.0-RC2
ViktorHofer Oct 26, 2021
139c750
Disable crashing tests against new issue
jkoritzinsky Nov 2, 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: 4 additions & 0 deletions eng/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,10 @@ foreach ($argument in $PSBoundParameters.Keys)
}
}

# Disable targeting pack caching as we reference a partially constructed targeting pack and update it later.
# The later changes are ignored when using the cache.
$env:DOTNETSDK_ALLOW_TARGETING_PACK_CACHING=0

$failedBuilds = @()

if ($os -eq "Browser") {
Expand Down
4 changes: 4 additions & 0 deletions eng/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,10 @@ fi

initDistroRid $os $arch $crossBuild $portableBuild

# Disable targeting pack caching as we reference a partially constructed targeting pack and update it later.
# The later changes are ignored when using the cache.
export DOTNETSDK_ALLOW_TARGETING_PACK_CACHING=0

# URL-encode space (%20) to avoid quoting issues until the msbuild call in /eng/common/tools.sh.
# In *proj files (XML docs), URL-encoded string are rendered in their decoded form.
cmakeargs="${cmakeargs// /%20}"
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": "6.0.100-rc.1.21430.12",
"version": "6.0.100-rc.2.21505.57",
ViktorHofer marked this conversation as resolved.
Show resolved Hide resolved
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "6.0.100-rc.1.21430.12"
"dotnet": "6.0.100-rc.2.21505.57"
},
"native-tools": {
"cmake": "3.16.4",
Expand Down
4 changes: 4 additions & 0 deletions src/installer/tests/HostActivation.Tests/NativeHosting/Nethost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ public void GetHostFxrPath_DotNetRootParameter(bool explicitLoad, bool useAssemb
}

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/61131", TestPlatforms.OSX)]
[InlineData(true, false, true, false)]
[InlineData(true, false, true, true)]
[InlineData(true, false, false, false)]
Expand Down Expand Up @@ -180,6 +181,7 @@ public void GetHostFxrPath_HostFxrAlreadyLoaded()
}

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/61131", TestPlatforms.OSX)]
[SkipOnPlatform(TestPlatforms.Windows, "This test targets the install_location config file which is only used on Linux and macOS.")]
[InlineData("{0}", false, true)]
[InlineData("{0}\n", false, true)]
Expand Down Expand Up @@ -245,6 +247,7 @@ public void GetHostFxrPath_InstallLocationFile(string value, bool shouldUseArchS
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/61131", TestPlatforms.OSX)]
[SkipOnPlatform(TestPlatforms.Windows, "This test targets the install_location config file which is only used on Linux and macOS.")]
public void GetHostFxrPath_GlobalInstallation_HasNoDefaultInstallationPath()
{
Expand Down Expand Up @@ -275,6 +278,7 @@ public void GetHostFxrPath_GlobalInstallation_HasNoDefaultInstallationPath()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/61131", TestPlatforms.OSX)]
[SkipOnPlatform(TestPlatforms.Windows, "This test targets the install_location config file which is only used on Linux and macOS.")]
public void GetHostFxrPath_GlobalInstallation_ArchitectureSpecificPathIsPickedOverDefaultPath()
{
Expand Down