Skip to content

Commit ea50b56

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/7.0.4xx' changes
2 parents 0273d7d + 7eb717b commit ea50b56

File tree

10 files changed

+19
-19
lines changed

10 files changed

+19
-19
lines changed

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -283,22 +283,22 @@
283283
</Dependency>
284284
</ProductDependencies>
285285
<ToolsetDependencies>
286-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23564.5">
286+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23580.4">
287287
<Uri>https://github.com/dotnet/arcade</Uri>
288-
<Sha>ca53a3149aaedb03e5d79ee0e259d31ac8719290</Sha>
288+
<Sha>28c80dc37ad1f33e5b0cca62d6a962ee130a1d09</Sha>
289289
<SourceBuild RepoName="arcade" ManagedOnly="true" />
290290
</Dependency>
291-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23564.5">
291+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23580.4">
292292
<Uri>https://github.com/dotnet/arcade</Uri>
293-
<Sha>ca53a3149aaedb03e5d79ee0e259d31ac8719290</Sha>
293+
<Sha>28c80dc37ad1f33e5b0cca62d6a962ee130a1d09</Sha>
294294
</Dependency>
295-
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.23564.5">
295+
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.23580.4">
296296
<Uri>https://github.com/dotnet/arcade</Uri>
297-
<Sha>ca53a3149aaedb03e5d79ee0e259d31ac8719290</Sha>
297+
<Sha>28c80dc37ad1f33e5b0cca62d6a962ee130a1d09</Sha>
298298
</Dependency>
299-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23564.5">
299+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23580.4">
300300
<Uri>https://github.com/dotnet/arcade</Uri>
301-
<Sha>ca53a3149aaedb03e5d79ee0e259d31ac8719290</Sha>
301+
<Sha>28c80dc37ad1f33e5b0cca62d6a962ee130a1d09</Sha>
302302
</Dependency>
303303
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0">
304304
<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.23564.5</MicrosoftDotNetSignToolVersion>
37+
<MicrosoftDotNetSignToolVersion>7.0.0-beta.23580.4</MicrosoftDotNetSignToolVersion>
3838
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
3939
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.1</SystemSecurityCryptographyProtectedDataPackageVersion>
4040
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -190,7 +190,7 @@
190190
<PropertyGroup>
191191
<FluentAssertionsVersion>6.11.0</FluentAssertionsVersion>
192192
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
193-
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23564.5</MicrosoftDotNetXUnitExtensionsVersion>
193+
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23580.4</MicrosoftDotNetXUnitExtensionsVersion>
194194
<MoqPackageVersion>4.18.4</MoqPackageVersion>
195195
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>6.0.0-beta.22262.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
196196
</PropertyGroup>

‎eng/common/darc-init.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
param (
22
$darcVersion = $null,
3-
$versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16',
3+
$versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16',
44
$verbosity = 'minimal',
55
$toolpath = $null
66
)

‎eng/common/darc-init.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source="${BASH_SOURCE[0]}"
44
darcVersion=''
5-
versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16'
5+
versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16'
66
verbosity='minimal'
77

88
while [[ $# > 0 ]]; do

‎eng/common/post-build/add-build-to-channel.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ param(
22
[Parameter(Mandatory=$true)][int] $BuildId,
33
[Parameter(Mandatory=$true)][int] $ChannelId,
44
[Parameter(Mandatory=$true)][string] $MaestroApiAccessToken,
5-
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
5+
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net',
66
[Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16'
77
)
88

‎eng/common/post-build/publish-using-darc.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ param(
33
[Parameter(Mandatory=$true)][int] $PublishingInfraVersion,
44
[Parameter(Mandatory=$true)][string] $AzdoToken,
55
[Parameter(Mandatory=$true)][string] $MaestroToken,
6-
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
6+
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net',
77
[Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
88
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
99
[Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters

‎eng/common/post-build/trigger-subscriptions.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ param(
22
[Parameter(Mandatory=$true)][string] $SourceRepo,
33
[Parameter(Mandatory=$true)][int] $ChannelId,
44
[Parameter(Mandatory=$true)][string] $MaestroApiAccessToken,
5-
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
5+
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net',
66
[Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16'
77
)
88

‎eng/common/templates/job/publish-build-assets.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
8888
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
8989
/p:BuildAssetRegistryToken=$(MaestroAccessToken)
90-
/p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
90+
/p:MaestroApiEndpoint=https://maestro.dot.net
9191
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
9292
/p:OfficialBuildId=$(Build.BuildNumber)
9393
condition: ${{ parameters.condition }}

‎eng/common/templates/post-build/common-variables.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ variables:
1010

1111
# Default Maestro++ API Endpoint and API Version
1212
- name: MaestroApiEndPoint
13-
value: "https://maestro-prod.westus2.cloudapp.azure.com"
13+
value: "https://maestro.dot.net"
1414
- name: MaestroApiAccessToken
1515
value: $(MaestroAccessToken)
1616
- name: MaestroApiVersion

‎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.23564.5",
15-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23564.5"
14+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23580.4",
15+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23580.4"
1616
}
1717
}

0 commit comments

Comments
 (0)