diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 9c120588ffdef..8dd812c7094b4 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21330.2", + "version": "1.0.0-prerelease.21357.4", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8301d951525f2..7bdf5be109dc9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,223 +8,223 @@ https://github.com/dotnet/msquic d7db669b70f4dd67ec001c192f9809c218cab88b - + https://github.com/dotnet/emsdk - f5349765b7af1970c5b25cce4ed278544907cbe0 + 5c9145289bd4d4e14b18a544dda60a185f66f688 - + https://github.com/dotnet/arcade - 26345756f99087811b1fe4d02ff213eb172ec506 + 286d98094b830b8dad769542b2669cb1b75f7097 - + https://github.com/dotnet/arcade - 26345756f99087811b1fe4d02ff213eb172ec506 + 286d98094b830b8dad769542b2669cb1b75f7097 - + https://github.com/dotnet/arcade - 26345756f99087811b1fe4d02ff213eb172ec506 + 286d98094b830b8dad769542b2669cb1b75f7097 - + https://github.com/dotnet/arcade - 26345756f99087811b1fe4d02ff213eb172ec506 + 286d98094b830b8dad769542b2669cb1b75f7097 - + https://github.com/dotnet/arcade - 26345756f99087811b1fe4d02ff213eb172ec506 + 286d98094b830b8dad769542b2669cb1b75f7097 - + https://github.com/dotnet/arcade - 26345756f99087811b1fe4d02ff213eb172ec506 + 286d98094b830b8dad769542b2669cb1b75f7097 - + https://github.com/dotnet/arcade - 26345756f99087811b1fe4d02ff213eb172ec506 + 286d98094b830b8dad769542b2669cb1b75f7097 - + https://github.com/dotnet/arcade - 26345756f99087811b1fe4d02ff213eb172ec506 + 286d98094b830b8dad769542b2669cb1b75f7097 - + https://github.com/dotnet/arcade - 26345756f99087811b1fe4d02ff213eb172ec506 + 286d98094b830b8dad769542b2669cb1b75f7097 - + https://github.com/dotnet/arcade - 26345756f99087811b1fe4d02ff213eb172ec506 + 286d98094b830b8dad769542b2669cb1b75f7097 - + https://github.com/dotnet/arcade - 26345756f99087811b1fe4d02ff213eb172ec506 + 286d98094b830b8dad769542b2669cb1b75f7097 - + https://github.com/dotnet/arcade - ff3e7d23139c30feefe36d3d4e8d41a06160f254 + 286d98094b830b8dad769542b2669cb1b75f7097 - + https://github.com/dotnet/arcade - 26345756f99087811b1fe4d02ff213eb172ec506 + 286d98094b830b8dad769542b2669cb1b75f7097 - + https://github.com/dotnet/arcade - 26345756f99087811b1fe4d02ff213eb172ec506 + 286d98094b830b8dad769542b2669cb1b75f7097 - + https://github.com/dotnet/arcade - 26345756f99087811b1fe4d02ff213eb172ec506 + 286d98094b830b8dad769542b2669cb1b75f7097 - + https://github.com/dotnet/arcade - ff3e7d23139c30feefe36d3d4e8d41a06160f254 + 286d98094b830b8dad769542b2669cb1b75f7097 https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - 8d7b898b96cbdb868cac343e938173105287ed9e + c6b17f3f85cb4ff078f7cd5264a9005f9b8c3334 - + https://github.com/dotnet/runtime-assets - 8d7b898b96cbdb868cac343e938173105287ed9e + c6b17f3f85cb4ff078f7cd5264a9005f9b8c3334 - + https://github.com/dotnet/runtime-assets - 8d7b898b96cbdb868cac343e938173105287ed9e + c6b17f3f85cb4ff078f7cd5264a9005f9b8c3334 - + https://github.com/dotnet/runtime-assets - 8d7b898b96cbdb868cac343e938173105287ed9e + c6b17f3f85cb4ff078f7cd5264a9005f9b8c3334 - + https://github.com/dotnet/runtime-assets - 8d7b898b96cbdb868cac343e938173105287ed9e + c6b17f3f85cb4ff078f7cd5264a9005f9b8c3334 - + https://github.com/dotnet/runtime-assets - 8d7b898b96cbdb868cac343e938173105287ed9e + c6b17f3f85cb4ff078f7cd5264a9005f9b8c3334 - + https://github.com/dotnet/runtime-assets - 8d7b898b96cbdb868cac343e938173105287ed9e + c6b17f3f85cb4ff078f7cd5264a9005f9b8c3334 - + https://github.com/dotnet/runtime-assets - 8d7b898b96cbdb868cac343e938173105287ed9e + c6b17f3f85cb4ff078f7cd5264a9005f9b8c3334 - + https://github.com/dotnet/runtime-assets - 8d7b898b96cbdb868cac343e938173105287ed9e + c6b17f3f85cb4ff078f7cd5264a9005f9b8c3334 - + https://github.com/dotnet/llvm-project - 51c322893cff67a67e503d00e9c328d9d40b6a06 + a05e5e9fb80f9bb6fd9100775dfe55be6f84729d - + https://github.com/dotnet/llvm-project - 51c322893cff67a67e503d00e9c328d9d40b6a06 + a05e5e9fb80f9bb6fd9100775dfe55be6f84729d - + https://github.com/dotnet/llvm-project - 51c322893cff67a67e503d00e9c328d9d40b6a06 + a05e5e9fb80f9bb6fd9100775dfe55be6f84729d - + https://github.com/dotnet/llvm-project - 51c322893cff67a67e503d00e9c328d9d40b6a06 + a05e5e9fb80f9bb6fd9100775dfe55be6f84729d - + https://github.com/dotnet/llvm-project - 51c322893cff67a67e503d00e9c328d9d40b6a06 + a05e5e9fb80f9bb6fd9100775dfe55be6f84729d - + https://github.com/dotnet/llvm-project - 51c322893cff67a67e503d00e9c328d9d40b6a06 + a05e5e9fb80f9bb6fd9100775dfe55be6f84729d - + https://github.com/dotnet/llvm-project - 51c322893cff67a67e503d00e9c328d9d40b6a06 + a05e5e9fb80f9bb6fd9100775dfe55be6f84729d - + https://github.com/dotnet/llvm-project - 51c322893cff67a67e503d00e9c328d9d40b6a06 + a05e5e9fb80f9bb6fd9100775dfe55be6f84729d https://github.com/dotnet/runtime 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - f891033db5b8ebf651176a3dcc3bec74a217f85e + 5c340e9ade0baf7f3c0aa0a9128bf36b158fe7d6 - + https://github.com/dotnet/runtime - f891033db5b8ebf651176a3dcc3bec74a217f85e + 5c340e9ade0baf7f3c0aa0a9128bf36b158fe7d6 - + https://github.com/dotnet/runtime - f891033db5b8ebf651176a3dcc3bec74a217f85e + 5c340e9ade0baf7f3c0aa0a9128bf36b158fe7d6 - + https://github.com/dotnet/runtime - f891033db5b8ebf651176a3dcc3bec74a217f85e + 5c340e9ade0baf7f3c0aa0a9128bf36b158fe7d6 - + https://github.com/dotnet/runtime - f891033db5b8ebf651176a3dcc3bec74a217f85e + 5c340e9ade0baf7f3c0aa0a9128bf36b158fe7d6 - + https://github.com/dotnet/runtime - f891033db5b8ebf651176a3dcc3bec74a217f85e + 5c340e9ade0baf7f3c0aa0a9128bf36b158fe7d6 - + https://github.com/dotnet/runtime - f891033db5b8ebf651176a3dcc3bec74a217f85e + 5c340e9ade0baf7f3c0aa0a9128bf36b158fe7d6 - + https://github.com/mono/linker - f574448d16af45f7ac2c4b89d71dea73dec86726 + 35a1c74d6a0dbd115bf079dc986cea59cdb01430 - + https://github.com/dotnet/xharness - 6d17e5ba4709de02f2e5c62a308f8518253cb002 + c6d444eaf7e95339589ceef371cbef0a90a4add5 - + https://github.com/dotnet/xharness - 6d17e5ba4709de02f2e5c62a308f8518253cb002 + c6d444eaf7e95339589ceef371cbef0a90a4add5 - + https://github.com/dotnet/arcade - 26345756f99087811b1fe4d02ff213eb172ec506 + 286d98094b830b8dad769542b2669cb1b75f7097 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 366fc54b3a9b6226dbbbf3672fae78ba82e82b6f + a89f052e97fec59a2d0148c08d3b4801567ec200 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 366fc54b3a9b6226dbbbf3672fae78ba82e82b6f + a89f052e97fec59a2d0148c08d3b4801567ec200 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 366fc54b3a9b6226dbbbf3672fae78ba82e82b6f + a89f052e97fec59a2d0148c08d3b4801567ec200 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 366fc54b3a9b6226dbbbf3672fae78ba82e82b6f + a89f052e97fec59a2d0148c08d3b4801567ec200 - + https://github.com/dotnet/hotreload-utils - a8e0dc88077495e43d7820f631815fa95ce92f8a + 3960ef9a8980181e840b5c1d64ed0b234711e850 - + https://github.com/dotnet/runtime-assets - 8d7b898b96cbdb868cac343e938173105287ed9e + c6b17f3f85cb4ff078f7cd5264a9005f9b8c3334 - + https://github.com/dotnet/roslyn-analyzers - fcddb771f42866f9521f23f093b1f30e129018bb + 77c6f0725c26442023c8eee2b143b899cb3f4eb7 diff --git a/eng/Versions.props b/eng/Versions.props index 5240e72cbb270..6c33719d6b31b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,30 +50,30 @@ 3.10.0 3.10.0 - 6.0.0-rc1.21324.1 + 6.0.0-rc1.21356.1 - 6.0.0-beta.21330.2 - 6.0.0-beta.21330.2 - 6.0.0-beta.21330.2 - 6.0.0-beta.21330.2 - 6.0.0-beta.21330.2 - 6.0.0-beta.21330.2 - 2.5.1-beta.21330.2 - 6.0.0-beta.21330.2 - 6.0.0-beta.21330.2 - 6.0.0-beta.21330.2 - 6.0.0-beta.21330.2 - 6.0.0-beta.21330.2 - 6.0.0-beta.21330.2 + 6.0.0-beta.21357.3 + 6.0.0-beta.21357.3 + 6.0.0-beta.21357.3 + 6.0.0-beta.21357.3 + 6.0.0-beta.21357.3 + 6.0.0-beta.21357.3 + 2.5.1-beta.21357.3 + 6.0.0-beta.21357.3 + 6.0.0-beta.21357.3 + 6.0.0-beta.21357.3 + 6.0.0-beta.21357.3 + 6.0.0-beta.21357.3 + 6.0.0-beta.21357.3 6.0.0-preview.1.102 6.0.0-alpha.1.20612.4 - 6.0.0-preview.7.21321.2 - 6.0.0-preview.7.21321.2 + 6.0.0-preview.7.21355.1 + 6.0.0-preview.7.21355.1 3.1.0 - 6.0.0-preview.7.21321.2 + 6.0.0-preview.7.21355.1 5.0.0 4.3.0 @@ -107,27 +107,27 @@ 5.0.0 5.0.0 4.8.1 - 6.0.0-preview.7.21321.2 - 6.0.0-preview.7.21321.2 + 6.0.0-preview.7.21355.1 + 6.0.0-preview.7.21355.1 4.5.4 4.5.0 - 6.0.0-preview.7.21321.2 + 6.0.0-preview.7.21355.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21307.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 + 6.0.0-beta.21356.1 + 6.0.0-beta.21356.1 + 6.0.0-beta.21356.1 + 6.0.0-beta.21356.1 + 6.0.0-beta.21356.1 + 6.0.0-beta.21356.1 + 6.0.0-beta.21356.1 + 6.0.0-beta.21356.1 + 6.0.0-beta.21356.1 + 6.0.0-beta.21356.1 - 1.0.0-prerelease.21330.5 - 1.0.0-prerelease.21330.5 - 1.0.0-prerelease.21330.5 - 1.0.0-prerelease.21330.5 + 1.0.0-prerelease.21357.3 + 1.0.0-prerelease.21357.3 + 1.0.0-prerelease.21357.3 + 1.0.0-prerelease.21357.3 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 @@ -151,9 +151,9 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21330.2 - 1.0.0-prerelease.21330.2 - 1.0.1-alpha.0.21330.1 + 1.0.0-prerelease.21357.4 + 1.0.0-prerelease.21357.4 + 1.0.1-alpha.0.21355.1 2.4.1 2.4.2 1.3.0 @@ -164,23 +164,23 @@ 5.0.0-preview-20201009.2 - 6.0.100-preview.6.21330.1 + 6.0.100-preview.6.21357.1 $(MicrosoftNETILLinkTasksVersion) 6.0.0-preview.7.21328.1 6.0.0-preview.7.21328.2 - 11.1.0-alpha.1.21328.1 - 11.1.0-alpha.1.21328.1 - 11.1.0-alpha.1.21328.1 - 11.1.0-alpha.1.21328.1 - 11.1.0-alpha.1.21328.1 - 11.1.0-alpha.1.21328.1 - 11.1.0-alpha.1.21328.1 - 11.1.0-alpha.1.21328.1 + 11.1.0-alpha.1.21357.1 + 11.1.0-alpha.1.21357.1 + 11.1.0-alpha.1.21357.1 + 11.1.0-alpha.1.21357.1 + 11.1.0-alpha.1.21357.1 + 11.1.0-alpha.1.21357.1 + 11.1.0-alpha.1.21357.1 + 11.1.0-alpha.1.21357.1 - 6.0.0-preview.7.21330.1 + 6.0.0-preview.7.21355.1 $(MicrosoftNETWorkloadEmscriptenManifest60100) diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index a0b5fc37f4388..18823840b1127 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -158,4 +158,10 @@ if ($dotnet5Source -ne $null) { AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } +$dotnet6Source = $sources.SelectSingleNode("add[@key='dotnet6']") +if ($dotnet6Source -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet6-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet6-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password +} + $doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 2734601c13c4b..ad3fb74fd2cc8 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -129,6 +129,30 @@ if [ "$?" == "0" ]; then PackageSources+=('dotnet5-internal-transport') fi +# Ensure dotnet6-internal and dotnet6-internal-transport are in the packageSources if the public dotnet6 feeds are present +grep -i "" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet6-internal') + + grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding dotnet6-internal-transport to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet6-internal-transport') +fi + # I want things split line by line PrevIFS=$IFS IFS=$'\n' diff --git a/global.json b/global.json index ca21d08dc3bb1..99807111962c2 100644 --- a/global.json +++ b/global.json @@ -12,13 +12,13 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21330.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21357.3", "Microsoft.DotNet.PackageValidation": "1.0.0-preview.7.21352.4", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21330.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21330.2", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21330.3", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21357.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21357.3", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21357.3", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", - "Microsoft.NET.Sdk.IL": "6.0.0-preview.7.21321.2" + "Microsoft.NET.Sdk.IL": "6.0.0-preview.7.21355.1" } } diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index 12d402fcb7e39..b2c49a6f3ed49 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -318,7 +318,8 @@ + Condition="'$(IncludeHelixCorrelationPayload)' == 'true' and '$(TargetOS)' != 'Browser'" + AsArchive="$(HelixCorrelationPayload.EndsWith('.zip'))" />