diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4965dfa757d3..0dac47540b55 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -233,22 +233,22 @@
-
+
https://github.com/dotnet/arcade
- 26345756f99087811b1fe4d02ff213eb172ec506
+ 615fbd8c498067deae160a696701eaf33155da56
-
+
https://github.com/dotnet/arcade
- 26345756f99087811b1fe4d02ff213eb172ec506
+ 615fbd8c498067deae160a696701eaf33155da56
-
+
https://github.com/dotnet/arcade
- 26345756f99087811b1fe4d02ff213eb172ec506
+ 615fbd8c498067deae160a696701eaf33155da56
-
+
https://github.com/dotnet/arcade
- 26345756f99087811b1fe4d02ff213eb172ec506
+ 615fbd8c498067deae160a696701eaf33155da56
https://github.com/dotnet/source-build
@@ -259,9 +259,9 @@
https://github.com/dotnet/runtime
cf2938f44fc1494ae984c52a1568a03d51e513ca
-
+
https://github.com/dotnet/xliff-tasks
- 45e08da009cf96a72c6b177a7e8f1fe6e6cac72c
+ dff6c8ede1bf9f95f09fccc2836dbc0564b853a1
diff --git a/eng/Versions.props b/eng/Versions.props
index 1f0a58a257e9..1bc7e1596217 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -29,7 +29,7 @@
2.0.0-beta1.21308.1
4.0.0
5.0.0
- 6.0.0-beta.21330.2
+ 6.0.0-beta.21355.2
3.1.0
6.0.0-preview.7.21351.2
4.3.0
@@ -154,7 +154,7 @@
4.19.2
4.19.0
- 6.0.0-beta.21330.2
+ 6.0.0-beta.21355.2
4.8.2
diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1
index a0b5fc37f438..18823840b112 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 2734601c13c4..ad3fb74fd2cc 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 3bcf95a62121..07326e6b2241 100644
--- a/global.json
+++ b/global.json
@@ -11,7 +11,7 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21330.2",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21330.2"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21355.2",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21355.2"
}
}