diff --git a/NuGet.config b/NuGet.config
index 11bcc2d5e56..9fab97a3f22 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,7 +4,7 @@
-
+
diff --git a/eng/Version.Details.props b/eng/Version.Details.props
index d996ac958d6..a8ecb1fbdc8 100644
--- a/eng/Version.Details.props
+++ b/eng/Version.Details.props
@@ -6,24 +6,24 @@ This file should be imported by eng/Versions.props
- 10.0.0-beta.25531.102
- 10.0.0-beta.25531.102
- 10.0.0-beta.25531.102
- 10.0.0
- 10.0.0
- 10.0.0
- 10.0.0
- 10.0.0
- 10.0.0
- 10.0.0
- 10.0.0-rtm.25531.102
- 10.0.0
- 10.0.0
- 10.0.0-rtm.25531.102
- 10.0.0
- 10.0.0
- 10.0.0
- 10.0.0
+ 10.0.0-beta.25554.104
+ 10.0.0-beta.25554.104
+ 10.0.0-beta.25554.104
+ 10.0.1
+ 10.0.1
+ 10.0.1
+ 10.0.1
+ 10.0.1
+ 10.0.1
+ 10.0.1
+ 10.0.1-servicing.25554.104
+ 10.0.1
+ 10.0.1
+ 10.0.1-servicing.25554.104
+ 10.0.1
+ 10.0.1
+ 10.0.1
+ 10.0.1
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d38dc92209b..09326cc9737 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,80 +1,80 @@
-
+
-
+
https://github.com/dotnet/dotnet
- ba86126261026d26f7c30cd3434680d3965a88cf
+ 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1
-
+
https://github.com/dotnet/dotnet
- ba86126261026d26f7c30cd3434680d3965a88cf
+ 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1
-
+
https://github.com/dotnet/dotnet
- ba86126261026d26f7c30cd3434680d3965a88cf
+ 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1
-
+
https://github.com/dotnet/dotnet
- ba86126261026d26f7c30cd3434680d3965a88cf
+ 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1
-
+
https://github.com/dotnet/dotnet
- ba86126261026d26f7c30cd3434680d3965a88cf
+ 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1
-
+
https://github.com/dotnet/dotnet
- ba86126261026d26f7c30cd3434680d3965a88cf
+ 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1
-
+
https://github.com/dotnet/dotnet
- ba86126261026d26f7c30cd3434680d3965a88cf
+ 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1
-
+
https://github.com/dotnet/dotnet
- ba86126261026d26f7c30cd3434680d3965a88cf
+ 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1
-
+
https://github.com/dotnet/dotnet
- ba86126261026d26f7c30cd3434680d3965a88cf
+ 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1
-
+
https://github.com/dotnet/dotnet
- ba86126261026d26f7c30cd3434680d3965a88cf
+ 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1
-
+
https://github.com/dotnet/dotnet
- ba86126261026d26f7c30cd3434680d3965a88cf
+ 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1
-
+
https://github.com/dotnet/dotnet
- ba86126261026d26f7c30cd3434680d3965a88cf
+ 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1
-
+
https://github.com/dotnet/dotnet
- ba86126261026d26f7c30cd3434680d3965a88cf
+ 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1
-
+
https://github.com/dotnet/dotnet
- ba86126261026d26f7c30cd3434680d3965a88cf
+ 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1
-
+
https://github.com/dotnet/dotnet
- ba86126261026d26f7c30cd3434680d3965a88cf
+ 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1
-
+
https://github.com/dotnet/dotnet
- ba86126261026d26f7c30cd3434680d3965a88cf
+ 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1
-
+
https://github.com/dotnet/dotnet
- ba86126261026d26f7c30cd3434680d3965a88cf
+ 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1
-
+
https://github.com/dotnet/dotnet
- ba86126261026d26f7c30cd3434680d3965a88cf
+ 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1
diff --git a/eng/Versions.props b/eng/Versions.props
index 73cbf27600b..19609d973d6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,8 +1,8 @@
- 10.0.0
- rtm
+ 10.0.1
+ servicing
False
true
@@ -16,7 +16,7 @@
False
-
+
17.14.28
17.14.28
@@ -25,6 +25,7 @@
4.14.0
4.14.0
+
1.1.3-beta1.24423.1
1.1.3-beta1.24352.1
@@ -41,4 +42,4 @@
1.12.0
2.1.11
-
\ No newline at end of file
+
diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1
index fc8d618014e..65ed3a8adef 100644
--- a/eng/common/SetupNugetSources.ps1
+++ b/eng/common/SetupNugetSources.ps1
@@ -1,6 +1,7 @@
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
-# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
-# disabled internal Maestro (darc-int*) feeds.
+# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
+# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
+# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
#
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
#
@@ -173,4 +174,16 @@ foreach ($dotnetVersion in $dotnetVersions) {
}
}
+# Check for dotnet-eng and add dotnet-eng-internal if present
+$dotnetEngSource = $sources.SelectSingleNode("add[@key='dotnet-eng']")
+if ($dotnetEngSource -ne $null) {
+ AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-eng-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
+}
+
+# Check for dotnet-tools and add dotnet-tools-internal if present
+$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']")
+if ($dotnetToolsSource -ne $null) {
+ AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
+}
+
$doc.Save($filename)
diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh
index b97cc536379..b2163abbe71 100755
--- a/eng/common/SetupNugetSources.sh
+++ b/eng/common/SetupNugetSources.sh
@@ -1,8 +1,9 @@
#!/usr/bin/env bash
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
-# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
-# disabled internal Maestro (darc-int*) feeds.
+# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
+# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
+# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
#
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
#
@@ -173,6 +174,18 @@ for DotNetVersion in ${DotNetVersions[@]} ; do
fi
done
+# Check for dotnet-eng and add dotnet-eng-internal if present
+grep -i " /dev/null
+if [ "$?" == "0" ]; then
+ AddOrEnablePackageSource "dotnet-eng-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$FeedSuffix"
+fi
+
+# Check for dotnet-tools and add dotnet-tools-internal if present
+grep -i " /dev/null
+if [ "$?" == "0" ]; then
+ AddOrEnablePackageSource "dotnet-tools-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$FeedSuffix"
+fi
+
# I want things split line by line
PrevIFS=$IFS
IFS=$'\n'
diff --git a/global.json b/global.json
index 560dd1301b4..69a3b3e69a1 100644
--- a/global.json
+++ b/global.json
@@ -18,7 +18,7 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25531.102",
- "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25531.102"
+ "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25554.104",
+ "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25554.104"
}
}