Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -191,29 +191,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
</ProductDependencies>
<ToolsetDependencies>
<!-- Arcade -->
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25119.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25124.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
<Sha>a496a627c10c3c27d9efc83c3c80b3e6a58ccc7b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25119.2">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25124.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
<Sha>a496a627c10c3c27d9efc83c3c80b3e6a58ccc7b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25119.2">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25124.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
<Sha>a496a627c10c3c27d9efc83c3c80b3e6a58ccc7b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25119.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25124.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
<Sha>a496a627c10c3c27d9efc83c3c80b3e6a58ccc7b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25119.2">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25124.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
<Sha>a496a627c10c3c27d9efc83c3c80b3e6a58ccc7b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25119.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25124.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
<Sha>a496a627c10c3c27d9efc83c3c80b3e6a58ccc7b</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
</PropertyGroup>
<!-- Arcade -->
<PropertyGroup>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25119.2</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25119.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25119.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25124.2</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25124.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25124.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
</PropertyGroup>
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->
Expand Down
9 changes: 4 additions & 5 deletions eng/common/core-templates/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,11 @@ jobs:
fetchDepth: 3
clean: true

- task: DownloadBuildArtifacts@0
displayName: Download artifact
- task: DownloadPipelineArtifact@2
displayName: Download Asset Manifests
inputs:
artifactName: AssetManifests
downloadPath: '$(Build.StagingDirectory)/Download'
checkDownloadedFiles: true
targetPath: '$(Build.StagingDirectory)/AssetManifests'
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}

Expand All @@ -95,7 +94,7 @@ jobs:
scriptLocation: scriptPath
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
/p:MaestroApiEndpoint=https://maestro.dot.net
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
/p:OfficialBuildId=$(Build.BuildNumber)
Expand Down
10 changes: 5 additions & 5 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "10.0.100-preview.2.25118.3",
"dotnet": "10.0.100-preview.3.25122.1",
"runtimes": {
"dotnet/x64": [
"$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)"
Expand All @@ -11,12 +11,12 @@
}
},
"sdk": {
"version": "10.0.100-preview.2.25118.3"
"version": "10.0.100-preview.3.25122.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25119.2",
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25119.2",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25119.2",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25124.2",
"Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.25124.2",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25124.2",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "10.0.0-preview.3.25120.10"
},
Expand Down