diff --git a/.pipelines/templates/release-upload-buildinfo.yml b/.pipelines/templates/release-upload-buildinfo.yml
index bcb2a43396f..c470af1fd6e 100644
--- a/.pipelines/templates/release-upload-buildinfo.yml
+++ b/.pipelines/templates/release-upload-buildinfo.yml
@@ -56,6 +56,9 @@ jobs:
$dateTime = [datetime]::new($dateTime.Ticks - ($dateTime.Ticks % [timespan]::TicksPerSecond), $dateTime.Kind)
$metadata = Get-Content -LiteralPath "$toolsDirectory/metadata.json" -ErrorAction Stop | ConvertFrom-Json
+ $stableReleaseTag = $metadata.StableReleaseTag -Replace 'v',''
+
+ $currentReleaseTag = $buildInfo.ReleaseTag -Replace 'v',''
$stableRelease = $metadata.StableRelease.PublishToChannels
$ltsRelease = $metadata.LTSRelease.PublishToChannels
@@ -65,40 +68,44 @@ jobs:
$buildInfo = $buildInfoJsonContent | ConvertFrom-Json
$buildInfo.ReleaseDate = $dateTime
+ $currentReleaseTag = $buildInfo.ReleaseTag -Replace 'v',''
$targetFile = "$ENV:PIPELINE_WORKSPACE/$fileName"
ConvertTo-Json -InputObject $buildInfo | Out-File $targetFile -Encoding ascii
- if ($stableRelease -or $fileName -eq "preview.json") {
- Set-BuildVariable -Name CopyMainBuildInfo -Value YES
+ if ($fileName -eq "preview.json") {
+ Set-BuildVariable -Name UploadPreview -Value YES
} else {
- Set-BuildVariable -Name CopyMainBuildInfo -Value NO
+ Set-BuildVariable -Name UploadPreview -Value NO
}
- Set-BuildVariable -Name BuildInfoJsonFile -Value $targetFile
-
- ## Create 'lts.json' if it's the latest stable and also a LTS release.
+ Set-BuildVariable -Name PreviewBuildInfoFile -Value $targetFile
+ ## Create 'lts.json' if marked as a LTS release.
if ($fileName -eq "stable.json") {
+ [System.Management.Automation.SemanticVersion] $stableVersion = $stableReleaseTag
+ [System.Management.Automation.SemanticVersion] $currentVersion = $currentReleaseTag
if ($ltsRelease) {
$ltsFile = "$ENV:PIPELINE_WORKSPACE/lts.json"
Copy-Item -Path $targetFile -Destination $ltsFile -Force
- Set-BuildVariable -Name LtsBuildInfoJsonFile -Value $ltsFile
- Set-BuildVariable -Name CopyLTSBuildInfo -Value YES
+ Set-BuildVariable -Name LTSBuildInfoFile -Value $ltsFile
+ Set-BuildVariable -Name UploadLTS -Value YES
} else {
- Set-BuildVariable -Name CopyLTSBuildInfo -Value NO
+ Set-BuildVariable -Name UploadLTS -Value NO
}
- $releaseTag = $buildInfo.ReleaseTag
- $version = $releaseTag -replace '^v'
- $semVersion = [System.Management.Automation.SemanticVersion] $version
+ ## Only update the stable.json if the current version is greater than the stable version.
+ if ($currentVersion -gt $stableVersion) {
+ $versionFile = "$ENV:PIPELINE_WORKSPACE/$($currentVersion.Major)-$($currentVersion.Minor).json"
+ Copy-Item -Path $targetFile -Destination $versionFile -Force
+ Set-BuildVariable -Name StableBuildInfoFile -Value $versionFile
+ Set-BuildVariable -Name UploadStable -Value YES
+ } else {
+ Set-BuildVariable -Name UploadStable -Value NO
+ }
- $versionFile = "$ENV:PIPELINE_WORKSPACE/$($semVersion.Major)-$($semVersion.Minor).json"
- Copy-Item -Path $targetFile -Destination $versionFile -Force
- Set-BuildVariable -Name VersionBuildInfoJsonFile -Value $versionFile
- Set-BuildVariable -Name CopyVersionBuildInfo -Value YES
} else {
- Set-BuildVariable -Name CopyVersionBuildInfo -Value NO
+ Set-BuildVariable -Name UploadStable -Value NO
}
displayName: Create json files
@@ -116,24 +123,27 @@ jobs:
$storageContext = New-AzStorageContext -StorageAccountName $storageAccount -UseConnectedAccount
- if ($env:CopyMainBuildInfo -eq 'YES') {
- $jsonFile = "$env:BuildInfoJsonFile"
+ #preview
+ if ($env:UploadPreview -eq 'YES') {
+ $jsonFile = "$env:PreviewBuildInfoFile"
$blobName = Get-Item $jsonFile | Split-Path -Leaf
Write-Verbose -Verbose "Uploading $jsonFile to $containerName/$prefix/$blobName"
Set-AzStorageBlobContent -File $jsonFile -Container $containerName -Blob "$prefix/$blobName" -Context $storageContext -Force
}
- if ($env:CopyLTSBuildInfo -eq 'YES') {
- $jsonFile = "$env:LtsBuildInfoJsonFile"
+ #LTS
+ if ($env:UploadLTS -eq 'YES') {
+ $jsonFile = "$env:LTSBuildInfoFile"
$blobName = Get-Item $jsonFile | Split-Path -Leaf
Write-Verbose -Verbose "Uploading $jsonFile to $containerName/$prefix/$blobName"
Set-AzStorageBlobContent -File $jsonFile -Container $containerName -Blob "$prefix/$blobName" -Context $storageContext -Force
}
- if ($env:CopyVersionBuildInfo -eq 'YES') {
- $jsonFile = "$env:VersionBuildInfoJsonFile"
+ #stable
+ if ($env:UploadStable -eq 'YES') {
+ $jsonFile = "$env:StableBuildInfoFile"
$blobName = Get-Item $jsonFile | Split-Path -Leaf
Write-Verbose -Verbose "Uploading $jsonFile to $containerName/$prefix/$blobName"
Set-AzStorageBlobContent -File $jsonFile -Container $containerName -Blob "$prefix/$blobName" -Context $storageContext -Force
}
- condition: and(succeeded(), eq(variables['CopyMainBuildInfo'], 'YES'))
+ condition: and(succeeded(), or(eq(variables['UploadPreview'], 'YES'), eq(variables['UploadLTS'], 'YES'), eq(variables['UploadStable'], 'YES')))
diff --git a/global.json b/global.json
index 936a420a573..c2af57a3fe4 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
{
"sdk": {
- "version": "10.0.101"
+ "version": "10.0.102"
}
}
diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj b/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
index f63196d3645..32e0d329886 100644
--- a/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
+++ b/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
@@ -8,7 +8,7 @@
-
+
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 b2622f0517f..7d9d61ede96 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 b99139eb68e..5ee999c2d9c 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -33,7 +33,7 @@
-
+
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 feea5665288..78232a2f1af 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 d3446d28c98..161170355e6 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -16,19 +16,19 @@
-
-
+
+
-
-
+
+
-
+
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index 178f0473f26..da5ea7ddd04 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 542fa8526ff..9b5e21811cf 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -32,12 +32,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index 03aa5697267..af62ecaacab 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index db2fde85955..cbb01a67da5 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,6 +7,6 @@
-
+
diff --git a/test/xUnit/xUnit.tests.csproj b/test/xUnit/xUnit.tests.csproj
index de5b04b8c6c..6ce2ee32ceb 100644
--- a/test/xUnit/xUnit.tests.csproj
+++ b/test/xUnit/xUnit.tests.csproj
@@ -29,7 +29,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index efbc103f25e..1001370ade7 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -1,5 +1,4 @@
{
- "$schema": "https://json.schemastore.org/component-detection-manifest.json",
"Registrations": [
{
"Component": {
@@ -46,7 +45,7 @@
"Type": "nuget",
"Nuget": {
"Name": "JsonPointer.Net",
- "Version": "6.0.0"
+ "Version": "6.0.1"
}
},
"DevelopmentDependency": false
@@ -86,7 +85,7 @@
"Type": "nuget",
"Nuget": {
"Name": "Microsoft.Bcl.AsyncInterfaces",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -126,7 +125,7 @@
"Type": "nuget",
"Nuget": {
"Name": "Microsoft.Extensions.ObjectPool",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -166,7 +165,7 @@
"Type": "nuget",
"Nuget": {
"Name": "Microsoft.Win32.Registry.AccessControl",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -176,7 +175,7 @@
"Type": "nuget",
"Nuget": {
"Name": "Microsoft.Win32.SystemEvents",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -186,7 +185,7 @@
"Type": "nuget",
"Nuget": {
"Name": "Microsoft.Windows.Compatibility",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -206,7 +205,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.android-arm.runtime.native.System.IO.Ports",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -216,7 +215,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.android-arm64.runtime.native.System.IO.Ports",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -226,7 +225,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.android-x64.runtime.native.System.IO.Ports",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -236,7 +235,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.android-x86.runtime.native.System.IO.Ports",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -246,7 +245,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.linux-arm.runtime.native.System.IO.Ports",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -256,7 +255,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.linux-arm64.runtime.native.System.IO.Ports",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -266,7 +265,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.linux-bionic-arm64.runtime.native.System.IO.Ports",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -276,7 +275,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.linux-bionic-x64.runtime.native.System.IO.Ports",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -286,7 +285,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.linux-musl-arm.runtime.native.System.IO.Ports",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -296,7 +295,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.linux-musl-arm64.runtime.native.System.IO.Ports",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -306,7 +305,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.linux-musl-x64.runtime.native.System.IO.Ports",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -316,7 +315,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.linux-x64.runtime.native.System.IO.Ports",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -326,7 +325,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.maccatalyst-arm64.runtime.native.System.IO.Ports",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -336,7 +335,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.maccatalyst-x64.runtime.native.System.IO.Ports",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -356,7 +355,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.native.System.IO.Ports",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -366,7 +365,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.osx-arm64.runtime.native.System.IO.Ports",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -376,7 +375,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.osx-x64.runtime.native.System.IO.Ports",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -436,7 +435,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.CodeDom",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -446,7 +445,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.ComponentModel.Composition.Registration",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -456,7 +455,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.ComponentModel.Composition",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -466,7 +465,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Configuration.ConfigurationManager",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -476,7 +475,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Data.Odbc",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -486,7 +485,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Data.OleDb",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -506,7 +505,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Diagnostics.EventLog",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -516,7 +515,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Diagnostics.PerformanceCounter",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -526,7 +525,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.DirectoryServices.AccountManagement",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -536,7 +535,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.DirectoryServices.Protocols",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -546,7 +545,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.DirectoryServices",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -556,7 +555,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Drawing.Common",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -566,7 +565,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.IO.Packaging",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -576,7 +575,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.IO.Ports",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -586,7 +585,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Management",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -596,7 +595,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Net.Http.WinHttpHandler",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -606,7 +605,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Reflection.Context",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -616,7 +615,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Runtime.Caching",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -626,7 +625,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Security.Cryptography.Pkcs",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -636,7 +635,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Security.Cryptography.ProtectedData",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -646,7 +645,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Security.Cryptography.Xml",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -656,7 +655,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Security.Permissions",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -706,7 +705,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.ServiceModel.Syndication",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -716,7 +715,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.ServiceProcess.ServiceController",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -726,7 +725,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Speech",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
@@ -746,10 +745,11 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Windows.Extensions",
- "Version": "10.0.1"
+ "Version": "10.0.2"
}
},
"DevelopmentDependency": false
}
- ]
+ ],
+ "$schema": "https://json.schemastore.org/component-detection-manifest.json"
}