Skip to content

Commit a9fe7a0

Browse files
marcpopMSFTmarcpopMSFT
authored
Merge branch 'release/7.0.2xx' into merge/release/7.0.1xx-to-release/7.0.2xx
2 parents 1ce7f36 + 9b4ca48 commit a9fe7a0

File tree

5 files changed

+65
-58
lines changed

5 files changed

+65
-58
lines changed

‎eng/Version.Details.xml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -10,41 +10,41 @@
1010
<Sha>0b4eccde51cf6aadf82cfba0b2a5e4aa4200beea</Sha>
1111
<SourceBuild RepoName="templating" ManagedOnly="true" />
1212
</Dependency>
13-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rtm.22505.15">
13+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rtm.22504.4">
1414
<Uri>https://github.com/dotnet/runtime</Uri>
15-
<Sha>5147f6fc78520db322118cc8287651cb54a506df</Sha>
15+
<Sha>6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9</Sha>
1616
</Dependency>
17-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rtm.22505.15">
17+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rtm.22504.4">
1818
<Uri>https://github.com/dotnet/runtime</Uri>
19-
<Sha>5147f6fc78520db322118cc8287651cb54a506df</Sha>
19+
<Sha>6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9</Sha>
2020
</Dependency>
21-
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-rtm.22505.15">
21+
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-rtm.22504.4">
2222
<Uri>https://github.com/dotnet/runtime</Uri>
23-
<Sha>5147f6fc78520db322118cc8287651cb54a506df</Sha>
23+
<Sha>6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-rtm.22505.15">
25+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-rtm.22504.4">
2626
<Uri>https://github.com/dotnet/runtime</Uri>
27-
<Sha>5147f6fc78520db322118cc8287651cb54a506df</Sha>
27+
<Sha>6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-rtm.22505.15">
29+
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-rtm.22504.4">
3030
<Uri>https://github.com/dotnet/runtime</Uri>
31-
<Sha>5147f6fc78520db322118cc8287651cb54a506df</Sha>
31+
<Sha>6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-rtm.22505.15">
33+
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-rtm.22504.4">
3434
<Uri>https://github.com/dotnet/runtime</Uri>
35-
<Sha>5147f6fc78520db322118cc8287651cb54a506df</Sha>
35+
<Sha>6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NET.HostModel" Version="7.0.0-rtm.22505.15">
37+
<Dependency Name="Microsoft.NET.HostModel" Version="7.0.0-rtm.22504.4">
3838
<Uri>https://github.com/dotnet/runtime</Uri>
39-
<Sha>5147f6fc78520db322118cc8287651cb54a506df</Sha>
39+
<Sha>6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-rtm.22505.15">
41+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-rtm.22504.4">
4242
<Uri>https://github.com/dotnet/runtime</Uri>
43-
<Sha>5147f6fc78520db322118cc8287651cb54a506df</Sha>
43+
<Sha>6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-rtm.22505.15">
45+
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-rtm.22504.4">
4646
<Uri>https://github.com/dotnet/runtime</Uri>
47-
<Sha>5147f6fc78520db322118cc8287651cb54a506df</Sha>
47+
<Sha>6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9</Sha>
4848
</Dependency>
4949
<Dependency Name="Microsoft.Build" Version="17.4.0-preview-22480-04">
5050
<Uri>https://github.com/dotnet/msbuild</Uri>
@@ -118,30 +118,30 @@
118118
<Sha>219e84c88def8276179f66282b2f7cb5f1d0d126</Sha>
119119
<SourceBuild RepoName="linker" ManagedOnly="true" />
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="7.0.0-rtm.22505.15">
121+
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="7.0.0-rtm.22504.4">
122122
<Uri>https://github.com/dotnet/runtime</Uri>
123-
<Sha>5147f6fc78520db322118cc8287651cb54a506df</Sha>
123+
<Sha>6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9</Sha>
124124
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
125125
</Dependency>
126126
<Dependency Name="Microsoft.NET.ILLink.Analyzers" Version="7.0.100-1.22471.3">
127127
<Uri>https://github.com/dotnet/linker</Uri>
128128
<Sha>219e84c88def8276179f66282b2f7cb5f1d0d126</Sha>
129129
</Dependency>
130-
<Dependency Name="System.CodeDom" Version="7.0.0-rtm.22505.15">
130+
<Dependency Name="System.CodeDom" Version="7.0.0-rtm.22504.4">
131131
<Uri>https://github.com/dotnet/runtime</Uri>
132-
<Sha>5147f6fc78520db322118cc8287651cb54a506df</Sha>
132+
<Sha>6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9</Sha>
133133
</Dependency>
134-
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="7.0.0-rtm.22505.15">
134+
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="7.0.0-rtm.22504.4">
135135
<Uri>https://github.com/dotnet/runtime</Uri>
136-
<Sha>5147f6fc78520db322118cc8287651cb54a506df</Sha>
136+
<Sha>6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9</Sha>
137137
</Dependency>
138-
<Dependency Name="System.Text.Encoding.CodePages" Version="7.0.0-rtm.22505.15">
138+
<Dependency Name="System.Text.Encoding.CodePages" Version="7.0.0-rtm.22504.4">
139139
<Uri>https://github.com/dotnet/runtime</Uri>
140-
<Sha>5147f6fc78520db322118cc8287651cb54a506df</Sha>
140+
<Sha>6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9</Sha>
141141
</Dependency>
142-
<Dependency Name="System.Resources.Extensions" Version="7.0.0-rtm.22505.15">
142+
<Dependency Name="System.Resources.Extensions" Version="7.0.0-rtm.22504.4">
143143
<Uri>https://github.com/dotnet/runtime</Uri>
144-
<Sha>5147f6fc78520db322118cc8287651cb54a506df</Sha>
144+
<Sha>6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9</Sha>
145145
</Dependency>
146146
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0-rtm.22478.5">
147147
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
@@ -271,26 +271,26 @@
271271
</Dependency>
272272
</ProductDependencies>
273273
<ToolsetDependencies>
274-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22464.4">
274+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22504.3">
275275
<Uri>https://github.com/dotnet/arcade</Uri>
276-
<Sha>720af493900b2f2bdc48e9ee12577983a5c9be36</Sha>
276+
<Sha>7b21b46b59a5731165568690f3d82d3486201040</Sha>
277277
<SourceBuild RepoName="arcade" ManagedOnly="true" />
278278
</Dependency>
279-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22464.4">
279+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22504.3">
280280
<Uri>https://github.com/dotnet/arcade</Uri>
281-
<Sha>720af493900b2f2bdc48e9ee12577983a5c9be36</Sha>
281+
<Sha>7b21b46b59a5731165568690f3d82d3486201040</Sha>
282282
</Dependency>
283-
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.22464.4">
283+
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.22504.3">
284284
<Uri>https://github.com/dotnet/arcade</Uri>
285-
<Sha>720af493900b2f2bdc48e9ee12577983a5c9be36</Sha>
285+
<Sha>7b21b46b59a5731165568690f3d82d3486201040</Sha>
286286
</Dependency>
287-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22464.4">
287+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22504.3">
288288
<Uri>https://github.com/dotnet/arcade</Uri>
289-
<Sha>720af493900b2f2bdc48e9ee12577983a5c9be36</Sha>
289+
<Sha>7b21b46b59a5731165568690f3d82d3486201040</Sha>
290290
</Dependency>
291-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0-rtm.22505.15">
291+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0-rtm.22504.4">
292292
<Uri>https://github.com/dotnet/runtime</Uri>
293-
<Sha>5147f6fc78520db322118cc8287651cb54a506df</Sha>
293+
<Sha>6bcb45f2d8913e67a3b1e7dc814d76b5ab8be4e9</Sha>
294294
</Dependency>
295295
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22427.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
296296
<Uri>https://github.com/dotnet/xliff-tasks</Uri>

‎eng/Versions.props‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</PropertyGroup>
1212
<!-- Repo Version Information -->
1313
<PropertyGroup>
14-
<VersionPrefix>7.0.100</VersionPrefix>
15-
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
14+
<VersionPrefix>7.0.200</VersionPrefix>
15+
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
1616
<PreReleaseVersionIteration>
1717
</PreReleaseVersionIteration>
1818
<!-- Enable to remove prerelease label. -->
@@ -34,28 +34,28 @@
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.22504.3</MicrosoftDotNetSignToolVersion>
3838
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
39-
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.0-rtm.22505.15</SystemSecurityCryptographyProtectedDataPackageVersion>
39+
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.0-rtm.22504.4</SystemSecurityCryptographyProtectedDataPackageVersion>
4040
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
4141
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
4242
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
4343
<SystemTextJsonVersion>6.0.0</SystemTextJsonVersion>
44-
<SystemReflectionMetadataLoadContextVersion>7.0.0-rtm.22505.15</SystemReflectionMetadataLoadContextVersion>
44+
<SystemReflectionMetadataLoadContextVersion>7.0.0-rtm.22504.4</SystemReflectionMetadataLoadContextVersion>
4545
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
4646
<SystemCommandLineVersion>2.0.0-beta4.22402.1</SystemCommandLineVersion>
4747
<MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview5.1.22263.1</MicrosoftDeploymentDotNetReleasesVersion>
4848
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.0.4496</MicrosoftVisualStudioSetupConfigurationInteropVersion>
4949
</PropertyGroup>
5050
<PropertyGroup>
5151
<!-- Dependencies from https://github.com/dotnet/runtime -->
52-
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rtm.22505.15</MicrosoftNETCoreAppRefPackageVersion>
53-
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rtm.22505.15</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
54-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-rtm.22505.15</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
52+
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rtm.22504.4</MicrosoftNETCoreAppRefPackageVersion>
53+
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rtm.22504.4</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
54+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-rtm.22504.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
5555
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
56-
<MicrosoftExtensionsDependencyModelPackageVersion>7.0.0-rtm.22505.15</MicrosoftExtensionsDependencyModelPackageVersion>
57-
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-rtm.22505.15</MicrosoftNETCoreDotNetHostResolverPackageVersion>
58-
<MicrosoftNETHostModelVersion>7.0.0-rtm.22505.15</MicrosoftNETHostModelVersion>
56+
<MicrosoftExtensionsDependencyModelPackageVersion>7.0.0-rtm.22504.4</MicrosoftExtensionsDependencyModelPackageVersion>
57+
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-rtm.22504.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
58+
<MicrosoftNETHostModelVersion>7.0.0-rtm.22504.4</MicrosoftNETHostModelVersion>
5959
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0-preview.7.21363.9</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
6060
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
6161
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0</MicrosoftExtensionsLoggingConsoleVersion>
@@ -91,10 +91,10 @@
9191
</PropertyGroup>
9292
<PropertyGroup>
9393
<!-- Dependencies from https://github.com/dotnet/runtime -->
94-
<SystemCodeDomPackageVersion>7.0.0-rtm.22505.15</SystemCodeDomPackageVersion>
95-
<SystemTextEncodingCodePagesPackageVersion>7.0.0-rtm.22505.15</SystemTextEncodingCodePagesPackageVersion>
96-
<SystemResourcesExtensionsPackageVersion>7.0.0-rtm.22505.15</SystemResourcesExtensionsPackageVersion>
97-
<MicrosoftDotNetILCompilerPackageVersion>7.0.0-rtm.22505.15</MicrosoftDotNetILCompilerPackageVersion>
94+
<SystemCodeDomPackageVersion>7.0.0-rtm.22504.4</SystemCodeDomPackageVersion>
95+
<SystemTextEncodingCodePagesPackageVersion>7.0.0-rtm.22504.4</SystemTextEncodingCodePagesPackageVersion>
96+
<SystemResourcesExtensionsPackageVersion>7.0.0-rtm.22504.4</SystemResourcesExtensionsPackageVersion>
97+
<MicrosoftDotNetILCompilerPackageVersion>7.0.0-rtm.22504.4</MicrosoftDotNetILCompilerPackageVersion>
9898
</PropertyGroup>
9999
<PropertyGroup>
100100
<!-- Dependencies from https://github.com/dotnet/format -->
@@ -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.22504.3</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
}

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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.22504.3",
15+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22504.3"
1616
}
1717
}

0 commit comments

Comments
 (0)