From 7d85b4f9a9c6e0647b76d91de622263cbd83ea09 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Oct 2022 12:00:20 +0000 Subject: [PATCH 1/9] Update dependencies from https://github.com/dotnet/arcade build 20221013.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22511.2 -> To Version 7.0.0-beta.22513.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c658e58f0b4..227f5d491d89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -271,22 +271,22 @@ - + https://github.com/dotnet/arcade - f760da39566d1cfa90c89e38d8dfafb3d43f9cae + 02e28316bf35d1028683ee313f0794776bff18d1 - + https://github.com/dotnet/arcade - f760da39566d1cfa90c89e38d8dfafb3d43f9cae + 02e28316bf35d1028683ee313f0794776bff18d1 - + https://github.com/dotnet/arcade - f760da39566d1cfa90c89e38d8dfafb3d43f9cae + 02e28316bf35d1028683ee313f0794776bff18d1 - + https://github.com/dotnet/arcade - f760da39566d1cfa90c89e38d8dfafb3d43f9cae + 02e28316bf35d1028683ee313f0794776bff18d1 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1460f902048c..a9d5ab6545c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 6.0.0 4.0.0 6.0.0 - 7.0.0-beta.22511.2 + 7.0.0-beta.22513.4 7.0.0-preview.22423.2 7.0.0 4.3.0 @@ -187,7 +187,7 @@ 6.7.0 6.1.0 - 7.0.0-beta.22511.2 + 7.0.0-beta.22513.4 4.8.2 6.0.0-beta.22262.1 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index c35087a06019..39be08d4b16c 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.2.1" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.3.1" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index aba6308ad313..449126943299 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -365,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.2.1&view=overview - $defaultXCopyMSBuildVersion = '17.2.1' + # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.3.1view=overview + $defaultXCopyMSBuildVersion = '17.3.1' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 6406b45210fd..6d4be896063e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-rc.1.22431.12", + "dotnet": "7.0.100-rc.2.22477.23", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22511.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22511.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22513.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22513.4" } } From 26cedb7888fa6b5681b716e619a1844452596d95 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Oct 2022 00:47:10 +0000 Subject: [PATCH 2/9] Update dependencies from https://github.com/dotnet/arcade build 20221014.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22511.2 -> To Version 7.0.0-beta.22514.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 227f5d491d89..0668a541c7f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -271,22 +271,22 @@ - + https://github.com/dotnet/arcade - 02e28316bf35d1028683ee313f0794776bff18d1 + 3083cc93619dbb153fdb7907b332efa18908f039 - + https://github.com/dotnet/arcade - 02e28316bf35d1028683ee313f0794776bff18d1 + 3083cc93619dbb153fdb7907b332efa18908f039 - + https://github.com/dotnet/arcade - 02e28316bf35d1028683ee313f0794776bff18d1 + 3083cc93619dbb153fdb7907b332efa18908f039 - + https://github.com/dotnet/arcade - 02e28316bf35d1028683ee313f0794776bff18d1 + 3083cc93619dbb153fdb7907b332efa18908f039 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a9d5ab6545c3..8e9c9358cf5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 6.0.0 4.0.0 6.0.0 - 7.0.0-beta.22513.4 + 7.0.0-beta.22514.3 7.0.0-preview.22423.2 7.0.0 4.3.0 @@ -187,7 +187,7 @@ 6.7.0 6.1.0 - 7.0.0-beta.22513.4 + 7.0.0-beta.22514.3 4.8.2 6.0.0-beta.22262.1 diff --git a/global.json b/global.json index 6d4be896063e..3dab91dd268d 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22513.4", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22513.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22514.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22514.3" } } From 02b89b34fa8781da5310571d7e34b14b7d643a79 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Nov 2022 16:37:18 +0000 Subject: [PATCH 3/9] Update dependencies from https://github.com/dotnet/arcade build 20221031.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22511.2 -> To Version 7.0.0-beta.22531.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0668a541c7f9..03805b6086e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -271,22 +271,22 @@ - + https://github.com/dotnet/arcade - 3083cc93619dbb153fdb7907b332efa18908f039 + e5703ddc4d3434bca1c86c9984a2162d9608093a - + https://github.com/dotnet/arcade - 3083cc93619dbb153fdb7907b332efa18908f039 + e5703ddc4d3434bca1c86c9984a2162d9608093a - + https://github.com/dotnet/arcade - 3083cc93619dbb153fdb7907b332efa18908f039 + e5703ddc4d3434bca1c86c9984a2162d9608093a - + https://github.com/dotnet/arcade - 3083cc93619dbb153fdb7907b332efa18908f039 + e5703ddc4d3434bca1c86c9984a2162d9608093a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8e9c9358cf5c..f469a5ce51fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 6.0.0 4.0.0 6.0.0 - 7.0.0-beta.22514.3 + 7.0.0-beta.22531.4 7.0.0-preview.22423.2 7.0.0 4.3.0 @@ -187,7 +187,7 @@ 6.7.0 6.1.0 - 7.0.0-beta.22514.3 + 7.0.0-beta.22531.4 4.8.2 6.0.0-beta.22262.1 diff --git a/global.json b/global.json index 3dab91dd268d..39032a7e0a2c 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22514.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22514.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22531.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22531.4" } } From f8fba629f2da6e6c4fa2147310ae0dfcb34b8fad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Nov 2022 18:55:57 +0000 Subject: [PATCH 4/9] Update dependencies from https://github.com/dotnet/arcade build 20221107.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22511.2 -> To Version 7.0.0-beta.22557.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 03805b6086e3..e44ea82933c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -271,22 +271,22 @@ - + https://github.com/dotnet/arcade - e5703ddc4d3434bca1c86c9984a2162d9608093a + dd38487d8af0ff04aa549142356cb0eaed11129b - + https://github.com/dotnet/arcade - e5703ddc4d3434bca1c86c9984a2162d9608093a + dd38487d8af0ff04aa549142356cb0eaed11129b - + https://github.com/dotnet/arcade - e5703ddc4d3434bca1c86c9984a2162d9608093a + dd38487d8af0ff04aa549142356cb0eaed11129b - + https://github.com/dotnet/arcade - e5703ddc4d3434bca1c86c9984a2162d9608093a + dd38487d8af0ff04aa549142356cb0eaed11129b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f469a5ce51fe..8efc1c1ee532 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 6.0.0 4.0.0 6.0.0 - 7.0.0-beta.22531.4 + 7.0.0-beta.22557.1 7.0.0-preview.22423.2 7.0.0 4.3.0 @@ -187,7 +187,7 @@ 6.7.0 6.1.0 - 7.0.0-beta.22531.4 + 7.0.0-beta.22557.1 4.8.2 6.0.0-beta.22262.1 diff --git a/global.json b/global.json index 39032a7e0a2c..2bdb7f740be7 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22531.4", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22531.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22557.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22557.1" } } From d4ff0c66d5a11ebca5d534d469232777082ec6f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Nov 2022 15:46:14 +0000 Subject: [PATCH 5/9] Update dependencies from https://github.com/dotnet/arcade build 20221108.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22511.2 -> To Version 7.0.0-beta.22558.4 --- NuGet.config | 2 -- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 6 +++--- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index abd0203f3b6c..cf26c6c8b14e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,6 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e44ea82933c9..8869f346b869 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -271,22 +271,22 @@ - + https://github.com/dotnet/arcade - dd38487d8af0ff04aa549142356cb0eaed11129b + 3f3c360819c5c092d0e4505a67dfe59a33fba557 - + https://github.com/dotnet/arcade - dd38487d8af0ff04aa549142356cb0eaed11129b + 3f3c360819c5c092d0e4505a67dfe59a33fba557 - + https://github.com/dotnet/arcade - dd38487d8af0ff04aa549142356cb0eaed11129b + 3f3c360819c5c092d0e4505a67dfe59a33fba557 - + https://github.com/dotnet/arcade - dd38487d8af0ff04aa549142356cb0eaed11129b + 3f3c360819c5c092d0e4505a67dfe59a33fba557 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8efc1c1ee532..f0dbdd346465 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 6.0.0 4.0.0 6.0.0 - 7.0.0-beta.22557.1 + 7.0.0-beta.22558.4 7.0.0-preview.22423.2 7.0.0 4.3.0 @@ -187,7 +187,7 @@ 6.7.0 6.1.0 - 7.0.0-beta.22557.1 + 7.0.0-beta.22558.4 4.8.2 6.0.0-beta.22262.1 diff --git a/global.json b/global.json index 2bdb7f740be7..182a0b637120 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-rc.2.22477.23", + "dotnet": "7.0.100", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22557.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22557.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22558.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22558.4" } } From 32c598b7e7aa9e77f83e63697290464d755879a9 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 10 Nov 2022 12:26:35 -0500 Subject: [PATCH 6/9] Fix normalization of TargetPlatformVersion for Windows This broke with changes related to https://github.com/dotnet/sdk/pull/27199. It's now possible to have multiple supported platform version items for the same version. --- .../targets/Microsoft.NET.TargetFrameworkInference.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets index 990c01e6c6b0..ba3ea515131b 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets @@ -199,7 +199,7 @@ Copyright (c) .NET Foundation. All rights reserved. - @(_ValidTargetPlatformVersion) + @(_ValidTargetPlatformVersion->Distinct()) From edea59c04221591612c6eae61329e48e38f0fc72 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 10 Nov 2022 16:02:42 -0500 Subject: [PATCH 7/9] Fix duplicate compilation constants --- .../targets/Microsoft.NET.Sdk.BeforeCommon.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets index 2ff2c1de9993..d9dc0fa0753b 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets @@ -226,7 +226,7 @@ Copyright (c) .NET Foundation. All rights reserved. Condition=" '$(DisableImplicitFrameworkDefines)' != 'true' and '$(TargetPlatformIdentifier)' != '' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), 5.0)) " > <_SupportedPlatformCompatibleVersions Include="@(SdkSupportedTargetPlatformVersion)" Condition=" %(Identity) != '' and $([MSBuild]::VersionLessThanOrEquals(%(Identity), $(TargetPlatformVersion))) " /> - <_ImplicitDefineConstant Include="@(_SupportedPlatformCompatibleVersions->'$(TargetPlatformIdentifier.ToUpper())%(Identity)_OR_GREATER'->Replace('.', '_'))" /> + <_ImplicitDefineConstant Include="@(_SupportedPlatformCompatibleVersions->Distinct()->'$(TargetPlatformIdentifier.ToUpper())%(Identity)_OR_GREATER'->Replace('.', '_'))" /> From 9490405b266647d1ba03c24eb670dae014ffd554 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 11 Nov 2022 13:08:19 -0500 Subject: [PATCH 8/9] Fix Blazor baselines to account for 6.0.11 --- .../Publish60Hosted_Works.Publish.files.json | 8 +++---- ...0Hosted_Works.Publish.staticwebassets.json | 24 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.files.json index 5cd05af188ff..4c4e3fd45d9a 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.files.json @@ -92,9 +92,9 @@ "${OutputPath}\\wwwroot\\_framework\\blazor.webassembly.js", "${OutputPath}\\wwwroot\\_framework\\blazor.webassembly.js.br", "${OutputPath}\\wwwroot\\_framework\\blazor.webassembly.js.gz", - "${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js", - "${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js.br", - "${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js.gz", + "${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.11.[[hash]].js", + "${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.11.[[hash]].js.br", + "${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.11.[[hash]].js.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat", "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.gz", @@ -115,4 +115,4 @@ "${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz", "${OutputPath}\\wwwroot\\css\\app.css", "${OutputPath}\\wwwroot\\index.html" -] \ No newline at end of file +] diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.staticwebassets.json index f73f86ac25f2..7a282a9e67ec 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.staticwebassets.json @@ -46,12 +46,12 @@ "OriginalItemSpec": "${RestorePath}\\microsoft.aspnetcore.components.webassembly\\[[CustomPackageVersion]]\\build\\net6.0\\blazor.webassembly.js" }, { - "Identity": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js", + "Identity": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.11.[[hash]].js", "SourceId": "BlazorWasmHosted60.Client", "SourceType": "Project", "ContentRoot": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\publish\\wwwroot\\", "BasePath": "/", - "RelativePath": "_framework/dotnet.6.0.9.[[hash]].js", + "RelativePath": "_framework/dotnet.6.0.11.[[hash]].js", "AssetKind": "Publish", "AssetMode": "All", "AssetRole": "Primary", @@ -60,7 +60,7 @@ "AssetTraitValue": "native", "CopyToOutputDirectory": "Never", "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js" + "OriginalItemSpec": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.11.[[hash]].js" }, { "Identity": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.timezones.blat", @@ -233,21 +233,21 @@ "OriginalItemSpec": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\blazor.webassembly.js" }, { - "Identity": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.6.0.9.[[hash]].js.gz]]", + "Identity": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.6.0.11.[[hash]].js.gz]]", "SourceId": "BlazorWasmHosted60.Client", "SourceType": "Project", "ContentRoot": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\publish\\wwwroot\\", "BasePath": "/", - "RelativePath": "_framework/dotnet.6.0.9.[[hash]].js.gz", + "RelativePath": "_framework/dotnet.6.0.11.[[hash]].js.gz", "AssetKind": "Publish", "AssetMode": "All", "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js", + "RelatedAsset": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.11.[[hash]].js", "AssetTraitName": "Content-Encoding", "AssetTraitValue": "gzip", "CopyToOutputDirectory": "Never", "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.6.0.9.[[hash]].js.gz]]" + "OriginalItemSpec": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.6.0.11.[[hash]].js.gz]]" }, { "Identity": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.wasm.gz]]", @@ -1270,21 +1270,21 @@ "OriginalItemSpec": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\blazor.webassembly.js" }, { - "Identity": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\compress\\[[_framework/dotnet.6.0.9.[[hash]].js.br]]", + "Identity": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\compress\\[[_framework/dotnet.6.0.11.[[hash]].js.br]]", "SourceId": "BlazorWasmHosted60.Client", "SourceType": "Project", "ContentRoot": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\publish\\wwwroot\\", "BasePath": "/", - "RelativePath": "_framework/dotnet.6.0.9.[[hash]].js.br", + "RelativePath": "_framework/dotnet.6.0.11.[[hash]].js.br", "AssetKind": "Publish", "AssetMode": "All", "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js", + "RelatedAsset": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.11.[[hash]].js", "AssetTraitName": "Content-Encoding", "AssetTraitValue": "br", "CopyToOutputDirectory": "Never", "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js" + "OriginalItemSpec": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.11.[[hash]].js" }, { "Identity": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\compress\\[[_framework/dotnet.timezones.blat.br]]", @@ -2001,4 +2001,4 @@ "OriginalItemSpec": "wwwroot\\index.html" } ] -} \ No newline at end of file +} From 91b88f351617f9ea9fc4a2d41bf45a484e6016d8 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 11 Nov 2022 13:09:33 -0500 Subject: [PATCH 9/9] Make analyzer test package name comparison case insensitive Depending on whether we're using preview versions, some of the packages may be downloaded by NuGet and have lowercased names, while at other times they may be shipped in the packs folder and have mixed case. --- .../GivenThatWeWantToUseAnalyzers.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseAnalyzers.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseAnalyzers.cs index 889ea4251b86..5d23f17da794 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseAnalyzers.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseAnalyzers.cs @@ -64,8 +64,8 @@ public void It_resolves_analyzers_correctly(string language, string testAssetNam case "C#": analyzers.Select(x => GetPackageAndPath(x)).Should().BeEquivalentTo(new[] { - ("Microsoft.NET.Sdk", (string) null, "analyzers/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll"), - ("Microsoft.NET.Sdk", (string)null, "analyzers/Microsoft.CodeAnalysis.NetAnalyzers.dll"), + ("microsoft.net.sdk", (string) null, "analyzers/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll"), + ("microsoft.net.sdk", (string)null, "analyzers/Microsoft.CodeAnalysis.NetAnalyzers.dll"), ("microsoft.netcore.app.ref", (string)null, "analyzers/dotnet/cs/System.Text.Json.SourceGeneration.dll"), ("microsoft.netcore.app.ref", (string)null, "analyzers/dotnet/cs/System.Text.RegularExpressions.Generator.dll"), ("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 case "VB": analyzers.Select(x => GetPackageAndPath(x)).Should().BeEquivalentTo( new[] { - ("Microsoft.NET.Sdk", (string)null, "analyzers/Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers.dll"), - ("Microsoft.NET.Sdk", (string)null, "analyzers/Microsoft.CodeAnalysis.NetAnalyzers.dll"), + ("microsoft.net.sdk", (string)null, "analyzers/Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers.dll"), + ("microsoft.net.sdk", (string)null, "analyzers/Microsoft.CodeAnalysis.NetAnalyzers.dll"), ("microsoft.codequality.analyzers", "2.6.0", "analyzers/dotnet/vb/Microsoft.CodeQuality.Analyzers.dll"), ("microsoft.codequality.analyzers", "2.6.0", "analyzers/dotnet/vb/Microsoft.CodeQuality.VisualBasic.Analyzers.dll"), ("microsoft.dependencyvalidation.analyzers", "0.9.0", "analyzers/dotnet/Microsoft.DependencyValidation.Analyzers.dll") @@ -161,7 +161,7 @@ public void It_resolves_multitargeted_analyzers() var components = path.Split(new char[] { '/' }, 2); string sdkName = components[0]; string pathInSdk = components[1]; - return (sdkName, null, pathInSdk); + return (sdkName.ToLowerInvariant(), null, pathInSdk); } foreach (var nugetRoot in nugetRoots) @@ -175,11 +175,11 @@ public void It_resolves_multitargeted_analyzers() var packageVersion = components[1]; var pathInPackage = components[2]; // Don't check package version for analyzers included in targeting pack, as the version changes during development - if (packageName.Equals("microsoft.netcore.app.ref", StringComparison.Ordinal)) + if (packageName.Equals("microsoft.netcore.app.ref", StringComparison.OrdinalIgnoreCase)) { packageVersion = null; } - return (packageName, packageVersion, pathInPackage); + return (packageName.ToLowerInvariant(), packageVersion, pathInPackage); } }