Skip to content

Commit

Permalink
Merge pull request #28591 from dotnet/darc-release/7.0.1xx-4848e855-5…
Browse files Browse the repository at this point in the history
…3e8-46da-b571-5cbd0ed52dc2

[release/7.0.1xx] Update dependencies from dotnet/arcade
  • Loading branch information
nagilson authored Nov 14, 2022
2 parents 8ba786d + 0ff29f8 commit af22f55
Show file tree
Hide file tree
Showing 12 changed files with 70 additions and 41 deletions.
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -275,22 +275,22 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22464.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22558.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>720af493900b2f2bdc48e9ee12577983a5c9be36</Sha>
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22464.4">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22558.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>720af493900b2f2bdc48e9ee12577983a5c9be36</Sha>
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.22464.4">
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.22558.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>720af493900b2f2bdc48e9ee12577983a5c9be36</Sha>
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22464.4">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22558.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>720af493900b2f2bdc48e9ee12577983a5c9be36</Sha>
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<SystemCollectionsImmutableVersion>6.0.0</SystemCollectionsImmutableVersion>
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
<MicrosoftDotNetSignToolVersion>7.0.0-beta.22464.4</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetSignToolVersion>7.0.0-beta.22558.4</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
Expand Down Expand Up @@ -187,7 +187,7 @@
<PropertyGroup>
<FluentAssertionsVersion>6.7.0</FluentAssertionsVersion>
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22464.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22558.4</MicrosoftDotNetXUnitExtensionsVersion>
<MoqPackageVersion>4.8.2</MoqPackageVersion>
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>6.0.0-beta.22262.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
</PropertyGroup>
Expand Down
5 changes: 5 additions & 0 deletions eng/common/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Param(
[string] $runtimeSourceFeed = '',
[string] $runtimeSourceFeedKey = '',
[switch] $excludePrereleaseVS,
[switch] $nativeToolsOnMachine,
[switch] $help,
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
)
Expand Down Expand Up @@ -66,6 +67,7 @@ function Print-Usage() {
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
Write-Host ""

Expand Down Expand Up @@ -146,6 +148,9 @@ try {
$nodeReuse = $false
}

if ($nativeToolsOnMachine) {
$env:NativeToolsOnMachine = $true
}
if ($restore) {
InitializeNativeTools
}
Expand Down
6 changes: 4 additions & 2 deletions eng/common/init-tools-native.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,12 @@ try {
Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed."
exit 1
}
$ToolDirectory = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)[0]
if ([string]::IsNullOrWhiteSpace($ToolDirectory)) {
$ToolDirectories = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)
if ($ToolDirectories -eq $null) {
Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image."
exit 1
}
$ToolDirectory = $ToolDirectories[0]
$BinPathFile = "$($ToolDirectory.FullName)\binpath.txt"
if (-not (Test-Path -Path "$BinPathFile")) {
Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool."
Expand All @@ -112,6 +113,7 @@ try {
$ToolPath = Convert-Path -Path $BinPath
Write-Host "Adding $ToolName to the path ($ToolPath)..."
Write-Host "##vso[task.prependpath]$ToolPath"
$env:PATH = "$ToolPath;$env:PATH"
$InstalledTools += @{ $ToolName = $ToolDirectory.FullName }
}
}
Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdk-task.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "7.0.100-rc.1.22431.12",
"dotnet": "7.0.100",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)"
Expand All @@ -11,7 +11,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22464.4",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22464.4"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22558.4",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22558.4"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
using Xunit.Abstractions;
using Microsoft.NET.TestFramework.ProjectConstruction;
using Newtonsoft.Json.Linq;
using NuGet.Versioning;

namespace Microsoft.NET.Build.Tests
{
Expand Down Expand Up @@ -393,6 +394,16 @@ public void It_implicitly_defines_compilation_constants_for_the_target_framework
[InlineData(new[] { "11.11", "12.12", "13.13" }, "android", "12.12", new[] { "ANDROID", "ANDROID12_12", "ANDROID11_11_OR_GREATER", "ANDROID12_12_OR_GREATER" })]
public void It_implicitly_defines_compilation_constants_for_the_target_platform(string[] sdkSupportedTargetPlatformVersion, string targetPlatformIdentifier, string targetPlatformVersion, string[] expectedDefines)
{
if (targetPlatformIdentifier.Equals("windows", StringComparison.OrdinalIgnoreCase))
{
var sdkVersion = SemanticVersion.Parse(TestContext.Current.ToolsetUnderTest.SdkVersion);
if (new SemanticVersion(sdkVersion.Major, sdkVersion.Minor, sdkVersion.Patch) < new SemanticVersion(7, 0, 200))
{
// Fixed in 7.0.200: https://github.com/dotnet/sdk/pull/29009
return;
}
}

var targetFramework = "net5.0";
var testAsset = _testAssetsManager
.CopyTestAsset("AppWithLibrary", "ImplicitFrameworkConstants", targetFramework, identifier: expectedDefines.GetHashCode().ToString())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using System.IO;
using System.Linq;
using System;
using NuGet.Versioning;

namespace Microsoft.NET.Build.Tests
{
Expand Down Expand Up @@ -197,6 +198,16 @@ public void It_fails_if_windows_target_platform_version_is_invalid()
[InlineData(false)]
public void It_succeeds_if_windows_target_platform_version_does_not_have_trailing_zeros(bool setInTargetframework)
{
if (!setInTargetframework)
{
var sdkVersion = SemanticVersion.Parse(TestContext.Current.ToolsetUnderTest.SdkVersion);
if (new SemanticVersion(sdkVersion.Major, sdkVersion.Minor, sdkVersion.Patch) < new SemanticVersion(7, 0, 200))
{
// Fixed in 7.0.200: https://github.com/dotnet/sdk/pull/29009
return;
}
}

var testProject = new TestProject()
{
Name = "ValidWindowsVersion",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand All @@ -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")
Expand Down Expand Up @@ -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)
Expand All @@ -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);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -115,4 +115,4 @@
"${OutputPath}\\wwwroot\\_framework\\icudt_no_CJK.dat.gz",
"${OutputPath}\\wwwroot\\css\\app.css",
"${OutputPath}\\wwwroot\\index.html"
]
]
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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]]",
Expand Down Expand Up @@ -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]]",
Expand Down Expand Up @@ -2001,4 +2001,4 @@
"OriginalItemSpec": "wwwroot\\index.html"
}
]
}
}

0 comments on commit af22f55

Please sign in to comment.