diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index 7a24b57b19..af1c3f4df8 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -1,13 +1,13 @@
{
"sdk": {
- "channel": "6.0.1xx-rc1",
+ "channel": "6.0.1xx",
"quality": "signed",
"qualityFallback": "daily",
- "packageVersionPattern": "6.0.0-rc.1",
+ "packageVersionPattern": "6.0.0",
"sdkImageVersion": "6.0.100",
- "nextChannel": "6.0.1xx-rc1"
+ "nextChannel": "6.0.1xx"
},
"internalfeed" : {
- "url": "https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rc.1.21458.32-shipping/nuget/v2"
+ "url": "https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rtm.21515.2-shipping/nuget/v2"
}
}
diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 8fcd2f987a..afa704126d 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -1990,6 +1990,9 @@
+
+
+
@@ -2052,6 +2055,9 @@
+
+
+
@@ -2114,6 +2120,9 @@
+
+
+
@@ -2176,6 +2185,9 @@
+
+
+
@@ -2238,6 +2250,9 @@
+
+
+
@@ -2300,6 +2315,9 @@
+
+
+
@@ -2362,6 +2380,9 @@
+
+
+
@@ -2424,6 +2445,9 @@
+
+
+
@@ -2486,6 +2510,9 @@
+
+
+
@@ -2548,6 +2575,9 @@
+
+
+
@@ -2610,6 +2640,9 @@
+
+
+
@@ -2672,6 +2705,9 @@
+
+
+
@@ -2734,6 +2770,9 @@
+
+
+
@@ -3109,8 +3148,11 @@
-
-
+
+
+
+
+
@@ -4110,10 +4152,24 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/global.json b/global.json
index 3ebca84bcf..ef0057ef2e 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
{
"sdk": {
- "version": "6.0.100-rc.2.21505.57"
+ "version": "6.0.100-rtm.21515.2"
}
}
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index fbf6e01456..3262a6a8af 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
@@ -47,7 +47,7 @@
-
+
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 2dc75f7edd..1ec44e3ad7 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -31,9 +31,9 @@
-
-
-
+
+
+
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index 238d772473..9313ff1644 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 3cb21e8d88..41e05d8f8f 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -18,9 +18,9 @@
-
-
-
+
+
+
@@ -30,7 +30,7 @@
-
+
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index 232a1ec314..f968375d7d 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index df46277a11..7a05d4f44c 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -16,16 +16,16 @@
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/test/perf/dotnet-tools/Reporting/Reporting.csproj b/test/perf/dotnet-tools/Reporting/Reporting.csproj
index ca56fc51ef..e0d2f3b824 100644
--- a/test/perf/dotnet-tools/Reporting/Reporting.csproj
+++ b/test/perf/dotnet-tools/Reporting/Reporting.csproj
@@ -1,4 +1,4 @@
-
+
Library
@@ -7,7 +7,7 @@
-
+
diff --git a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
index 9934bd0df2..5274b08d61 100644
--- a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
+++ b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
@@ -1,4 +1,4 @@
-
+
Exe
$(PERFLAB_TARGET_FRAMEWORKS)
@@ -6,10 +6,10 @@
latest
-
+
-
+
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index 8ad3769503..8315b9bea3 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index ca6c52c562..71f31eae61 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 3e50a22097..443ac51ac9 100644
--- a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
index 036022f1c6..0fdc86f24e 100644
--- a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
+++ b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml b/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
index 5fdb9f7d97..dbc018a1ae 100644
--- a/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
+++ b/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
@@ -5,7 +5,7 @@ parameters:
steps:
- pwsh: |
Import-Module ${{ parameters.repoRoot }}/build.psm1 -Force
- New-NugetConfigFile -NugetFeedUrl $(AzDevOpsFeed) -UserName $(AzDevOpsFeedUserName) -ClearTextPAT $(AzDevOpsFeedPAT2) -FeedName AzDevOpsFeed -Destination '${{ parameters.repoRoot }}/src/Modules'
+ New-NugetConfigFile -NugetFeedUrl $(PSInternalNugetFeed) -UserName $(PSInternalNugetFeedUserName) -ClearTextPAT $(PSInternalNugetFeedPAT) -FeedName AzDevOpsFeed -Destination '${{ parameters.repoRoot }}/src/Modules'
if(-not (Test-Path "${{ parameters.repoRoot }}/src/Modules/nuget.config"))
{