Skip to content

Commit 22c1f98

Browse files
dsplaisteddsplaisted
authored
Merge pull request #29009 from dsplaisted/fix-normalize-windows-platform-version
Fix TargetPlatformVersion normalization for Windows
2 parents b1e1cfb + 91b88f3 commit 22c1f98

File tree

10 files changed

+41
-41
lines changed

10 files changed

+41
-41
lines changed

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -271,22 +271,22 @@
271271
</Dependency>
272272
</ProductDependencies>
273273
<ToolsetDependencies>
274-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22511.2">
274+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22558.4">
275275
<Uri>https://github.com/dotnet/arcade</Uri>
276-
<Sha>f760da39566d1cfa90c89e38d8dfafb3d43f9cae</Sha>
276+
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
277277
<SourceBuild RepoName="arcade" ManagedOnly="true" />
278278
</Dependency>
279-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22511.2">
279+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22558.4">
280280
<Uri>https://github.com/dotnet/arcade</Uri>
281-
<Sha>f760da39566d1cfa90c89e38d8dfafb3d43f9cae</Sha>
281+
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
282282
</Dependency>
283-
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.22511.2">
283+
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.22558.4">
284284
<Uri>https://github.com/dotnet/arcade</Uri>
285-
<Sha>f760da39566d1cfa90c89e38d8dfafb3d43f9cae</Sha>
285+
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
286286
</Dependency>
287-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22511.2">
287+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22558.4">
288288
<Uri>https://github.com/dotnet/arcade</Uri>
289-
<Sha>f760da39566d1cfa90c89e38d8dfafb3d43f9cae</Sha>
289+
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
290290
</Dependency>
291291
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0">
292292
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<SystemCollectionsImmutableVersion>6.0.0</SystemCollectionsImmutableVersion>
3535
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3636
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
37-
<MicrosoftDotNetSignToolVersion>7.0.0-beta.22511.2</MicrosoftDotNetSignToolVersion>
37+
<MicrosoftDotNetSignToolVersion>7.0.0-beta.22558.4</MicrosoftDotNetSignToolVersion>
3838
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
3939
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4040
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -187,7 +187,7 @@
187187
<PropertyGroup>
188188
<FluentAssertionsVersion>6.8.0</FluentAssertionsVersion>
189189
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
190-
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22511.2</MicrosoftDotNetXUnitExtensionsVersion>
190+
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22558.4</MicrosoftDotNetXUnitExtensionsVersion>
191191
<MoqPackageVersion>4.8.2</MoqPackageVersion>
192192
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>6.0.0-beta.22262.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
193193
</PropertyGroup>

‎eng/common/sdk-task.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.2.1" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.3.1" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

‎eng/common/tools.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
365365

366366
# If the version of msbuild is going to be xcopied,
367367
# use this version. Version matches a package here:
368-
# https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.2.1&view=overview
369-
$defaultXCopyMSBuildVersion = '17.2.1'
368+
# https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.3.1view=overview
369+
$defaultXCopyMSBuildVersion = '17.3.1'
370370

371371
if (!$vsRequirements) {
372372
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "7.0.100-rc.1.22431.12",
3+
"dotnet": "7.0.100",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)"
@@ -11,7 +11,7 @@
1111
}
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22511.2",
15-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22511.2"
14+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22558.4",
15+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22558.4"
1616
}
1717
}

‎src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ Copyright (c) .NET Foundation. All rights reserved.
225225
Condition=" '$(DisableImplicitFrameworkDefines)' != 'true' and '$(TargetPlatformIdentifier)' != '' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), 5.0)) " >
226226
<ItemGroup>
227227
<_SupportedPlatformCompatibleVersions Include="@(SdkSupportedTargetPlatformVersion)" Condition=" %(Identity) != '' and $([MSBuild]::VersionLessThanOrEquals(%(Identity), $(TargetPlatformVersion))) " />
228-
<_ImplicitDefineConstant Include="@(_SupportedPlatformCompatibleVersions->'$(TargetPlatformIdentifier.ToUpper())%(Identity)_OR_GREATER'->Replace('.', '_'))" />
228+
<_ImplicitDefineConstant Include="@(_SupportedPlatformCompatibleVersions->Distinct()->'$(TargetPlatformIdentifier.ToUpper())%(Identity)_OR_GREATER'->Replace('.', '_'))" />
229229
</ItemGroup>
230230
</Target>
231231

‎src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ Copyright (c) .NET Foundation. All rights reserved.
199199
</ItemGroup>
200200

201201
<PropertyGroup>
202-
<TargetPlatformVersion Condition="'@(_ValidTargetPlatformVersion)' != '' and '@(_ValidTargetPlatformVersion->Count())' == '1' and '@(_ValidTargetPlatformVersion)' != '$(TargetPlatformVersion)'">@(_ValidTargetPlatformVersion)</TargetPlatformVersion>
202+
<TargetPlatformVersion Condition="'@(_ValidTargetPlatformVersion)' != '' and '@(_ValidTargetPlatformVersion->Distinct()->Count())' == '1' and '@(_ValidTargetPlatformVersion)' != '$(TargetPlatformVersion)'">@(_ValidTargetPlatformVersion->Distinct())</TargetPlatformVersion>
203203
</PropertyGroup>
204204
</Target>
205205

‎src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseAnalyzers.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ public void It_resolves_analyzers_correctly(string language, string testAssetNam
6464
case "C#":
6565
analyzers.Select(x => GetPackageAndPath(x)).Should().BeEquivalentTo(new[]
6666
{
67-
("Microsoft.NET.Sdk", (string) null, "analyzers/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll"),
68-
("Microsoft.NET.Sdk", (string)null, "analyzers/Microsoft.CodeAnalysis.NetAnalyzers.dll"),
67+
("microsoft.net.sdk", (string) null, "analyzers/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll"),
68+
("microsoft.net.sdk", (string)null, "analyzers/Microsoft.CodeAnalysis.NetAnalyzers.dll"),
6969
("microsoft.netcore.app.ref", (string)null, "analyzers/dotnet/cs/System.Text.Json.SourceGeneration.dll"),
7070
("microsoft.netcore.app.ref", (string)null, "analyzers/dotnet/cs/System.Text.RegularExpressions.Generator.dll"),
7171
("microsoft.codequality.analyzers", "2.6.0", "analyzers/dotnet/cs/Microsoft.CodeQuality.Analyzers.dll"),
@@ -81,8 +81,8 @@ public void It_resolves_analyzers_correctly(string language, string testAssetNam
8181
case "VB":
8282
analyzers.Select(x => GetPackageAndPath(x)).Should().BeEquivalentTo( new[]
8383
{
84-
("Microsoft.NET.Sdk", (string)null, "analyzers/Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers.dll"),
85-
("Microsoft.NET.Sdk", (string)null, "analyzers/Microsoft.CodeAnalysis.NetAnalyzers.dll"),
84+
("microsoft.net.sdk", (string)null, "analyzers/Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers.dll"),
85+
("microsoft.net.sdk", (string)null, "analyzers/Microsoft.CodeAnalysis.NetAnalyzers.dll"),
8686
("microsoft.codequality.analyzers", "2.6.0", "analyzers/dotnet/vb/Microsoft.CodeQuality.Analyzers.dll"),
8787
("microsoft.codequality.analyzers", "2.6.0", "analyzers/dotnet/vb/Microsoft.CodeQuality.VisualBasic.Analyzers.dll"),
8888
("microsoft.dependencyvalidation.analyzers", "0.9.0", "analyzers/dotnet/Microsoft.DependencyValidation.Analyzers.dll")
@@ -161,7 +161,7 @@ public void It_resolves_multitargeted_analyzers()
161161
var components = path.Split(new char[] { '/' }, 2);
162162
string sdkName = components[0];
163163
string pathInSdk = components[1];
164-
return (sdkName, null, pathInSdk);
164+
return (sdkName.ToLowerInvariant(), null, pathInSdk);
165165
}
166166

167167
foreach (var nugetRoot in nugetRoots)
@@ -175,11 +175,11 @@ public void It_resolves_multitargeted_analyzers()
175175
var packageVersion = components[1];
176176
var pathInPackage = components[2];
177177
// Don't check package version for analyzers included in targeting pack, as the version changes during development
178-
if (packageName.Equals("microsoft.netcore.app.ref", StringComparison.Ordinal))
178+
if (packageName.Equals("microsoft.netcore.app.ref", StringComparison.OrdinalIgnoreCase))
179179
{
180180
packageVersion = null;
181181
}
182-
return (packageName, packageVersion, pathInPackage);
182+
return (packageName.ToLowerInvariant(), packageVersion, pathInPackage);
183183
}
184184
}
185185

‎src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.files.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@
9292
"${OutputPath}\\wwwroot\\_framework\\blazor.webassembly.js",
9393
"${OutputPath}\\wwwroot\\_framework\\blazor.webassembly.js.br",
9494
"${OutputPath}\\wwwroot\\_framework\\blazor.webassembly.js.gz",
95-
"${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js",
96-
"${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js.br",
97-
"${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js.gz",
95+
"${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.11.[[hash]].js",
96+
"${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.11.[[hash]].js.br",
97+
"${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.11.[[hash]].js.gz",
9898
"${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat",
9999
"${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.br",
100100
"${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.gz",
@@ -115,4 +115,4 @@
115115
"${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz",
116116
"${OutputPath}\\wwwroot\\css\\app.css",
117117
"${OutputPath}\\wwwroot\\index.html"
118-
]
118+
]

‎src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.staticwebassets.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@
4646
"OriginalItemSpec": "${RestorePath}\\microsoft.aspnetcore.components.webassembly\\[[CustomPackageVersion]]\\build\\net6.0\\blazor.webassembly.js"
4747
},
4848
{
49-
"Identity": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js",
49+
"Identity": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.11.[[hash]].js",
5050
"SourceId": "BlazorWasmHosted60.Client",
5151
"SourceType": "Project",
5252
"ContentRoot": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\publish\\wwwroot\\",
5353
"BasePath": "/",
54-
"RelativePath": "_framework/dotnet.6.0.9.[[hash]].js",
54+
"RelativePath": "_framework/dotnet.6.0.11.[[hash]].js",
5555
"AssetKind": "Publish",
5656
"AssetMode": "All",
5757
"AssetRole": "Primary",
@@ -60,7 +60,7 @@
6060
"AssetTraitValue": "native",
6161
"CopyToOutputDirectory": "Never",
6262
"CopyToPublishDirectory": "PreserveNewest",
63-
"OriginalItemSpec": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js"
63+
"OriginalItemSpec": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.11.[[hash]].js"
6464
},
6565
{
6666
"Identity": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.timezones.blat",
@@ -233,21 +233,21 @@
233233
"OriginalItemSpec": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\blazor.webassembly.js"
234234
},
235235
{
236-
"Identity": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.6.0.9.[[hash]].js.gz]]",
236+
"Identity": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.6.0.11.[[hash]].js.gz]]",
237237
"SourceId": "BlazorWasmHosted60.Client",
238238
"SourceType": "Project",
239239
"ContentRoot": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\publish\\wwwroot\\",
240240
"BasePath": "/",
241-
"RelativePath": "_framework/dotnet.6.0.9.[[hash]].js.gz",
241+
"RelativePath": "_framework/dotnet.6.0.11.[[hash]].js.gz",
242242
"AssetKind": "Publish",
243243
"AssetMode": "All",
244244
"AssetRole": "Alternative",
245-
"RelatedAsset": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js",
245+
"RelatedAsset": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.11.[[hash]].js",
246246
"AssetTraitName": "Content-Encoding",
247247
"AssetTraitValue": "gzip",
248248
"CopyToOutputDirectory": "Never",
249249
"CopyToPublishDirectory": "PreserveNewest",
250-
"OriginalItemSpec": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.6.0.9.[[hash]].js.gz]]"
250+
"OriginalItemSpec": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.6.0.11.[[hash]].js.gz]]"
251251
},
252252
{
253253
"Identity": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.wasm.gz]]",
@@ -1270,21 +1270,21 @@
12701270
"OriginalItemSpec": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\blazor.webassembly.js"
12711271
},
12721272
{
1273-
"Identity": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\compress\\[[_framework/dotnet.6.0.9.[[hash]].js.br]]",
1273+
"Identity": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\compress\\[[_framework/dotnet.6.0.11.[[hash]].js.br]]",
12741274
"SourceId": "BlazorWasmHosted60.Client",
12751275
"SourceType": "Project",
12761276
"ContentRoot": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\publish\\wwwroot\\",
12771277
"BasePath": "/",
1278-
"RelativePath": "_framework/dotnet.6.0.9.[[hash]].js.br",
1278+
"RelativePath": "_framework/dotnet.6.0.11.[[hash]].js.br",
12791279
"AssetKind": "Publish",
12801280
"AssetMode": "All",
12811281
"AssetRole": "Alternative",
1282-
"RelatedAsset": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js",
1282+
"RelatedAsset": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.11.[[hash]].js",
12831283
"AssetTraitName": "Content-Encoding",
12841284
"AssetTraitValue": "br",
12851285
"CopyToOutputDirectory": "Never",
12861286
"CopyToPublishDirectory": "PreserveNewest",
1287-
"OriginalItemSpec": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js"
1287+
"OriginalItemSpec": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.11.[[hash]].js"
12881288
},
12891289
{
12901290
"Identity": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\compress\\[[_framework/dotnet.timezones.blat.br]]",
@@ -2001,4 +2001,4 @@
20012001
"OriginalItemSpec": "wwwroot\\index.html"
20022002
}
20032003
]
2004-
}
2004+
}

0 commit comments

Comments
 (0)