diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index 9ca72b0577..d4c6229d22 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -4,7 +4,7 @@
"quality": "daily",
"qualityFallback": "preview",
"packageVersionPattern": "9.0.0-preview.6",
- "sdkImageVersion": "10.0.100-preview.2.25164.34",
+ "sdkImageVersion": "10.0.100-preview.3.25201.16",
"nextChannel": "9.0.0-preview.7",
"azureFeed": "",
"sdkImageOverride": ""
diff --git a/global.json b/global.json
index c30f249d4b..6303b53248 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
{
"sdk": {
- "version": "10.0.100-preview.2.25164.34"
+ "version": "10.0.100-preview.3.25201.16"
}
}
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 3b01307f43..a7f90c8ccb 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 387da67b86..e6b792f416 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 5926c2ec20..5ea5705d94 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -33,8 +33,8 @@
-
-
+
+
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 f5556d7e8e..753be4a64d 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 4ac82f133e..abcb46aa52 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -16,13 +16,13 @@
-
-
+
+
-
-
+
+
-
+
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index 66a9653e5d..a7b2a5836e 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/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj b/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj
index 00a5188ca5..ab4d21b585 100644
--- a/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj
+++ b/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj
@@ -15,6 +15,6 @@
-
+
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 59fc5e0944..d590b8be71 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -32,17 +32,17 @@
-
-
+
+
-
+
-
+
-
-
+
+
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index 7d06d8897f..08dcfa51e8 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 a582db86d7..02dd5677c3 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,6 +7,6 @@
-
+
diff --git a/tools/cgmanifest.json b/tools/cgmanifest.json
index eb4f103513..b0673c30fe 100644
--- a/tools/cgmanifest.json
+++ b/tools/cgmanifest.json
@@ -85,7 +85,7 @@
"Type": "nuget",
"Nuget": {
"Name": "Microsoft.Bcl.AsyncInterfaces",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -125,7 +125,7 @@
"Type": "nuget",
"Nuget": {
"Name": "Microsoft.Extensions.ObjectPool",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -165,7 +165,7 @@
"Type": "nuget",
"Nuget": {
"Name": "Microsoft.Win32.Registry.AccessControl",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -175,7 +175,7 @@
"Type": "nuget",
"Nuget": {
"Name": "Microsoft.Win32.SystemEvents",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -185,7 +185,7 @@
"Type": "nuget",
"Nuget": {
"Name": "Microsoft.Windows.Compatibility",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -205,7 +205,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.android-arm.runtime.native.System.IO.Ports",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -215,7 +215,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.android-arm64.runtime.native.System.IO.Ports",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -225,7 +225,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.android-x64.runtime.native.System.IO.Ports",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -235,7 +235,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.android-x86.runtime.native.System.IO.Ports",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -245,7 +245,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.linux-arm.runtime.native.System.IO.Ports",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -255,7 +255,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.linux-arm64.runtime.native.System.IO.Ports",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -265,7 +265,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.linux-bionic-arm64.runtime.native.System.IO.Ports",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -275,7 +275,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.linux-bionic-x64.runtime.native.System.IO.Ports",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -285,7 +285,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.linux-musl-arm.runtime.native.System.IO.Ports",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -295,7 +295,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.linux-musl-arm64.runtime.native.System.IO.Ports",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -305,7 +305,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.linux-musl-x64.runtime.native.System.IO.Ports",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -315,7 +315,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.linux-x64.runtime.native.System.IO.Ports",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -325,7 +325,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.maccatalyst-arm64.runtime.native.System.IO.Ports",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -335,7 +335,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.maccatalyst-x64.runtime.native.System.IO.Ports",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -355,7 +355,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.native.System.IO.Ports",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -365,7 +365,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.osx-arm64.runtime.native.System.IO.Ports",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -375,7 +375,7 @@
"Type": "nuget",
"Nuget": {
"Name": "runtime.osx-x64.runtime.native.System.IO.Ports",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -435,7 +435,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.CodeDom",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -445,7 +445,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.ComponentModel.Composition.Registration",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -455,7 +455,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.ComponentModel.Composition",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -465,7 +465,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Configuration.ConfigurationManager",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -475,7 +475,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Data.Odbc",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -485,7 +485,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Data.OleDb",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -505,7 +505,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Diagnostics.EventLog",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -515,7 +515,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Diagnostics.PerformanceCounter",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -525,7 +525,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.DirectoryServices.AccountManagement",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -535,7 +535,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.DirectoryServices.Protocols",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -545,7 +545,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.DirectoryServices",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -555,7 +555,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Drawing.Common",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -565,7 +565,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.IO.Packaging",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -575,7 +575,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.IO.Ports",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -585,7 +585,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Management",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -595,7 +595,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Net.Http.WinHttpHandler",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -615,7 +615,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Reflection.Context",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -625,7 +625,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Runtime.Caching",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -635,7 +635,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Security.Cryptography.Pkcs",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -645,7 +645,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Security.Cryptography.ProtectedData",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -655,7 +655,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Security.Cryptography.Xml",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -665,7 +665,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Security.Permissions",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -725,7 +725,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.ServiceModel.Syndication",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -735,7 +735,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.ServiceProcess.ServiceController",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -745,7 +745,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Speech",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -755,7 +755,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Threading.AccessControl",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
@@ -775,7 +775,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Windows.Extensions",
- "Version": "9.0.3"
+ "Version": "9.0.4"
}
},
"DevelopmentDependency": false
diff --git a/tools/packaging/boms/windows.json b/tools/packaging/boms/windows.json
index 18b25f019f..6edb2da459 100644
--- a/tools/packaging/boms/windows.json
+++ b/tools/packaging/boms/windows.json
@@ -121,7 +121,8 @@
},
{
"Pattern": "D3DCompiler_47_cor3.dll",
- "FileType": "NonProduct"
+ "FileType": "NonProduct",
+ "Architecture": ["x64, x86"]
},
{
"Pattern": "de/Microsoft.CodeAnalysis.CSharp.resources.dll",
@@ -1899,6 +1900,10 @@
"Pattern": "ref\\System.Linq.AsyncEnumerable.dll",
"FileType": "NonProduct"
},
+ {
+ "Pattern": "ref\\System.Net.ServerSentEvents.dll",
+ "FileType": "NonProduct"
+ },
{
"Pattern": "ru/Microsoft.CodeAnalysis.CSharp.resources.dll",
"FileType": "NonProduct"
@@ -2579,6 +2584,10 @@
"Pattern": "System.Net.Security.dll",
"FileType": "NonProduct"
},
+ {
+ "Pattern": "System.Net.ServerSentEvents.dll",
+ "FileType": "NonProduct"
+ },
{
"Pattern": "System.Net.ServicePoint.dll",
"FileType": "NonProduct"
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index f8961cc488..4b54a2ff1c 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -3354,7 +3354,7 @@ function New-MSIPackage
$buildArguments = New-MsiArgsArray -Argument $arguments
- Test-Bom -Path $staging -BomName windows
+ Test-Bom -Path $staging -BomName windows -Architecture $ProductTargetArchitecture -Verbose
Start-NativeExecution -VerboseOutputOnError { & $wixPaths.wixHeatExePath dir $staging -dr VersionFolder -cg ApplicationFiles -ag -sfrag -srd -scom -sreg -out $wixFragmentPath -var var.ProductSourcePath $buildArguments -v}
Send-AzdoFile -Path $wixFragmentPath
@@ -4982,6 +4982,9 @@ class BomRecord {
[string]
$FileType = "NonProduct"
+ [string[]]
+ $Architecture
+
# Add methods to normalize Pattern to use `/` as the directory separator,
# but give a Pattern that is usable on the current platform
[string]
@@ -5011,6 +5014,13 @@ class BomRecord {
# If the directory separator character is a slash, then set the pattern as-is
$this.Pattern = $Pattern
}
+
+ [void]
+ EnsureArchitecture([string[]]$DefaultArchitecture = @("x64","x86","arm64")) {
+ if (-not $this.PSObject.Properties.Match("Architecture")) {
+ $this.Architecture = $DefaultArchitecture
+ }
+ }
}
# Verify a folder based on a BOM json.
@@ -5024,7 +5034,9 @@ function Test-Bom {
[string]
$Path,
[switch]
- $Fix
+ $Fix,
+ [string]
+ $Architecture
)
Write-Log "verifying no unauthorized files have been added or removed..."