diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 83315009a74ef4964cb3e858ee4170e5b27a545d..55f9d6114ad1f8b110d32c5e3a8e6ebe35e46ab0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -59,13 +59,13 @@
https://github.com/dotnet/runtime
ddea36269ee4522213a6a9db8680f9da03935f7d
-
+
https://github.com/dotnet/arcade
- 54d096ee50a9bcf7ac6efd16a07d51af651d20a1
+ 71b580038fb704df63e03c6b7ae7d2c6a4fdd71d
-
+
https://github.com/dotnet/arcade
- 54d096ee50a9bcf7ac6efd16a07d51af651d20a1
+ 71b580038fb704df63e03c6b7ae7d2c6a4fdd71d
https://github.com/dotnet/runtime
@@ -91,17 +91,17 @@
https://github.com/dotnet/runtime
ddea36269ee4522213a6a9db8680f9da03935f7d
-
+
https://github.com/dotnet/arcade
- 54d096ee50a9bcf7ac6efd16a07d51af651d20a1
+ 71b580038fb704df63e03c6b7ae7d2c6a4fdd71d
-
+
https://github.com/dotnet/arcade
- 54d096ee50a9bcf7ac6efd16a07d51af651d20a1
+ 71b580038fb704df63e03c6b7ae7d2c6a4fdd71d
-
+
https://github.com/dotnet/arcade
- 54d096ee50a9bcf7ac6efd16a07d51af651d20a1
+ 71b580038fb704df63e03c6b7ae7d2c6a4fdd71d
https://github.com/dotnet/runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 09df9fae3619794a85f39e7fba595a7983f2bd07..aec6295ac744e86124abcc70cd281a77a880b8c7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -41,9 +41,9 @@
- 5.0.0-beta.20309.1
- 5.0.0-beta.20309.1
- 5.0.0-beta.20309.1
+ 5.0.0-beta.20316.1
+ 5.0.0-beta.20316.1
+ 5.0.0-beta.20316.1
diff --git a/eng/common/cross/armel/tizen-build-rootfs.sh b/eng/common/cross/armel/tizen-build-rootfs.sh
index 87c48e78fbb47468784e175374b98bb01a0c8fb8..25a0efa0bdd6a97c0fa0a10bf8b2dcbebef8fef8 100755
--- a/eng/common/cross/armel/tizen-build-rootfs.sh
+++ b/eng/common/cross/armel/tizen-build-rootfs.sh
@@ -9,13 +9,6 @@ if [[ -z "$ROOTFS_DIR" ]]; then
exit 1;
fi
-# Clean-up (TODO-Cleanup: We may already delete $ROOTFS_DIR at ./cross/build-rootfs.sh.)
-# hk0110
-if [ -d "$ROOTFS_DIR" ]; then
- umount $ROOTFS_DIR/*
- rm -rf $ROOTFS_DIR
-fi
-
TIZEN_TMP_DIR=$ROOTFS_DIR/tizen_tmp
mkdir -p $TIZEN_TMP_DIR
diff --git a/eng/common/performance/perfhelixpublish.proj b/eng/common/performance/perfhelixpublish.proj
index 3f7315b741fb182b68acb3a24cc482838dab6f2b..47d3ba00f3f21fb4fe7db3e24da101645140d87b 100644
--- a/eng/common/performance/perfhelixpublish.proj
+++ b/eng/common/performance/perfhelixpublish.proj
@@ -152,10 +152,6 @@
$(WorkItemDirectory)\ScenarioCorrelation
$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single System.Private.CoreLib.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root
-
- $(WorkItemDirectory)\ScenarioCorrelation
- $(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --composite %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\framework-r2r.dll.rsp --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root
-
\ No newline at end of file
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index 75890b373cef9d339ac9bba1f01c198d8a55ced9..514bfaa5ea0a7302c1003d33d94fe10216a31322 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -48,11 +48,14 @@ parameters:
NetEngServicesProdChannelId: 679
Net5Preview5ChannelId: 857
Net5Preview6ChannelId: 1013
- Net5Preview7ChannelId: 1014
+ Net5Preview7ChannelId: 1065
NetCoreSDK313xxChannelId: 759
NetCoreSDK313xxInternalChannelId: 760
NetCoreSDK314xxChannelId: 921
NetCoreSDK314xxInternalChannelId: 922
+ VS166ChannelId: 1010
+ VS167ChannelId: 1011
+ VSMasterChannelId: 1012
stages:
- ${{ if ne(parameters.inline, 'true') }}:
@@ -111,7 +114,7 @@ stages:
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1
arguments: -PromoteToChannels "$(TargetChannels)"
- -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview5ChannelId}},${{parameters.Net5Preview6ChannelId}},${{parameters.Net5Preview7ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}}
+ -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview5ChannelId}},${{parameters.Net5Preview6ChannelId}},${{parameters.Net5Preview7ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}}${{parameters.VS167ChannelId}},${{parameters.VSMasterChannelId}}
- job:
displayName: NuGet Validation
@@ -479,3 +482,42 @@ stages:
transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json'
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json'
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json'
+
+ - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
+ parameters:
+ artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
+ dependsOn: ${{ parameters.publishDependsOn }}
+ publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
+ symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
+ stageName: 'VS16_6_Publishing'
+ channelName: 'VS 16.6'
+ channelId: ${{ parameters.VS166ChannelId }}
+ transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
+ shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
+ symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
+
+ - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
+ parameters:
+ artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
+ dependsOn: ${{ parameters.publishDependsOn }}
+ publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
+ symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
+ stageName: 'VS16_7_Publishing'
+ channelName: 'VS 16.7'
+ channelId: ${{ parameters.VS167ChannelId }}
+ transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
+ shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
+ symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
+
+ - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
+ parameters:
+ artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
+ dependsOn: ${{ parameters.publishDependsOn }}
+ publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
+ symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
+ stageName: 'VS_Master_Publishing'
+ channelName: 'VS Master'
+ channelId: ${{ parameters.VSMasterChannelId }}
+ transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
+ shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
+ symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
\ No newline at end of file
diff --git a/global.json b/global.json
index 5512bcbc7d56d06054db72c9d2aafabf8fc0c911..a8f5d1eb4906ea3ba40ca947181de134619f0cd7 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "5.0.100-preview.6.20266.3",
+ "dotnet": "5.0.100-preview.6.20323.1",
"runtimes": {
"dotnet": [
"2.1.7",
@@ -12,11 +12,11 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20309.1",
- "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20309.1"
+ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20316.1",
+ "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20316.1"
},
"sdk": {
- "version": "5.0.100-preview.6.20266.3"
+ "version": "5.0.100-preview.6.20323.1"
},
"native-tools": {
"strawberry-perl": "5.28.1.1-1",