Skip to content

Commit af22f55

Browse files
nagilsonnagilson
authored
Merge pull request #28591 from dotnet/darc-release/7.0.1xx-4848e855-53e8-46da-b571-5cbd0ed52dc2
[release/7.0.1xx] Update dependencies from dotnet/arcade
2 parents 8ba786d + 0ff29f8 commit af22f55

File tree

12 files changed

+70
-41
lines changed

12 files changed

+70
-41
lines changed

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -275,22 +275,22 @@
275275
</Dependency>
276276
</ProductDependencies>
277277
<ToolsetDependencies>
278-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22464.4">
278+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22558.4">
279279
<Uri>https://github.com/dotnet/arcade</Uri>
280-
<Sha>720af493900b2f2bdc48e9ee12577983a5c9be36</Sha>
280+
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
281281
<SourceBuild RepoName="arcade" ManagedOnly="true" />
282282
</Dependency>
283-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22464.4">
283+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22558.4">
284284
<Uri>https://github.com/dotnet/arcade</Uri>
285-
<Sha>720af493900b2f2bdc48e9ee12577983a5c9be36</Sha>
285+
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
286286
</Dependency>
287-
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.22464.4">
287+
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.22558.4">
288288
<Uri>https://github.com/dotnet/arcade</Uri>
289-
<Sha>720af493900b2f2bdc48e9ee12577983a5c9be36</Sha>
289+
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
290290
</Dependency>
291-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22464.4">
291+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22558.4">
292292
<Uri>https://github.com/dotnet/arcade</Uri>
293-
<Sha>720af493900b2f2bdc48e9ee12577983a5c9be36</Sha>
293+
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
294294
</Dependency>
295295
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0">
296296
<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.22464.4</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.7.0</FluentAssertionsVersion>
189189
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
190-
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22464.4</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/build.ps1‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Param(
2626
[string] $runtimeSourceFeed = '',
2727
[string] $runtimeSourceFeedKey = '',
2828
[switch] $excludePrereleaseVS,
29+
[switch] $nativeToolsOnMachine,
2930
[switch] $help,
3031
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
3132
)
@@ -66,6 +67,7 @@ function Print-Usage() {
6667
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
6768
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
6869
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
70+
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
6971
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
7072
Write-Host ""
7173

@@ -146,6 +148,9 @@ try {
146148
$nodeReuse = $false
147149
}
148150

151+
if ($nativeToolsOnMachine) {
152+
$env:NativeToolsOnMachine = $true
153+
}
149154
if ($restore) {
150155
InitializeNativeTools
151156
}

‎eng/common/init-tools-native.ps1‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,12 @@ try {
9898
Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed."
9999
exit 1
100100
}
101-
$ToolDirectory = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)[0]
102-
if ([string]::IsNullOrWhiteSpace($ToolDirectory)) {
101+
$ToolDirectories = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)
102+
if ($ToolDirectories -eq $null) {
103103
Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image."
104104
exit 1
105105
}
106+
$ToolDirectory = $ToolDirectories[0]
106107
$BinPathFile = "$($ToolDirectory.FullName)\binpath.txt"
107108
if (-not (Test-Path -Path "$BinPathFile")) {
108109
Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool."
@@ -112,6 +113,7 @@ try {
112113
$ToolPath = Convert-Path -Path $BinPath
113114
Write-Host "Adding $ToolName to the path ($ToolPath)..."
114115
Write-Host "##vso[task.prependpath]$ToolPath"
116+
$env:PATH = "$ToolPath;$env:PATH"
115117
$InstalledTools += @{ $ToolName = $ToolDirectory.FullName }
116118
}
117119
}

‎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.22464.4",
15-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22464.4"
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/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
using Xunit.Abstractions;
1818
using Microsoft.NET.TestFramework.ProjectConstruction;
1919
using Newtonsoft.Json.Linq;
20+
using NuGet.Versioning;
2021

2122
namespace Microsoft.NET.Build.Tests
2223
{
@@ -393,6 +394,16 @@ public void It_implicitly_defines_compilation_constants_for_the_target_framework
393394
[InlineData(new[] { "11.11", "12.12", "13.13" }, "android", "12.12", new[] { "ANDROID", "ANDROID12_12", "ANDROID11_11_OR_GREATER", "ANDROID12_12_OR_GREATER" })]
394395
public void It_implicitly_defines_compilation_constants_for_the_target_platform(string[] sdkSupportedTargetPlatformVersion, string targetPlatformIdentifier, string targetPlatformVersion, string[] expectedDefines)
395396
{
397+
if (targetPlatformIdentifier.Equals("windows", StringComparison.OrdinalIgnoreCase))
398+
{
399+
var sdkVersion = SemanticVersion.Parse(TestContext.Current.ToolsetUnderTest.SdkVersion);
400+
if (new SemanticVersion(sdkVersion.Major, sdkVersion.Minor, sdkVersion.Patch) < new SemanticVersion(7, 0, 200))
401+
{
402+
// Fixed in 7.0.200: https://github.com/dotnet/sdk/pull/29009
403+
return;
404+
}
405+
}
406+
396407
var targetFramework = "net5.0";
397408
var testAsset = _testAssetsManager
398409
.CopyTestAsset("AppWithLibrary", "ImplicitFrameworkConstants", targetFramework, identifier: expectedDefines.GetHashCode().ToString())

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using System.IO;
1313
using System.Linq;
1414
using System;
15+
using NuGet.Versioning;
1516

1617
namespace Microsoft.NET.Build.Tests
1718
{
@@ -197,6 +198,16 @@ public void It_fails_if_windows_target_platform_version_is_invalid()
197198
[InlineData(false)]
198199
public void It_succeeds_if_windows_target_platform_version_does_not_have_trailing_zeros(bool setInTargetframework)
199200
{
201+
if (!setInTargetframework)
202+
{
203+
var sdkVersion = SemanticVersion.Parse(TestContext.Current.ToolsetUnderTest.SdkVersion);
204+
if (new SemanticVersion(sdkVersion.Major, sdkVersion.Minor, sdkVersion.Patch) < new SemanticVersion(7, 0, 200))
205+
{
206+
// Fixed in 7.0.200: https://github.com/dotnet/sdk/pull/29009
207+
return;
208+
}
209+
}
210+
200211
var testProject = new TestProject()
201212
{
202213
Name = "ValidWindowsVersion",

‎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

0 commit comments

Comments
 (0)