Skip to content

[master] Update dependencies from dotnet/arcade #2624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RussKie merged 5 commits into from
Jan 8, 2020
Merged

[master] Update dependencies from dotnet/arcade #2624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e3be521
Update dependencies from https://github.com/dotnet/arcade build 20200…
dotnet-maestro[bot] Jan 4, 2020
94a4f4d
Update dependencies from https://github.com/dotnet/arcade build 20200…
dotnet-maestro[bot] Jan 5, 2020
96c3b2c
Update dependencies from https://github.com/dotnet/arcade build 20200…
dotnet-maestro[bot] Jan 6, 2020
409596b
Update dependencies from https://github.com/dotnet/arcade build 20200…
dotnet-maestro[bot] Jan 7, 2020
d764e86
Update dependencies from https://github.com/dotnet/arcade build 20200…
dotnet-maestro[bot] Jan 8, 2020
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
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,25 +67,25 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
<SourceBuildId>5596</SourceBuildId>
</Dependency>
<!-- Arcade -->
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20052.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20057.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98cc270f5e08096729fc7d54ffafa9e3c6576316</Sha>
<Sha>d0833c8e5e58cfc507ce3c8da364e55931190263</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20052.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20057.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98cc270f5e08096729fc7d54ffafa9e3c6576316</Sha>
<Sha>d0833c8e5e58cfc507ce3c8da364e55931190263</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20052.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20057.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98cc270f5e08096729fc7d54ffafa9e3c6576316</Sha>
<Sha>d0833c8e5e58cfc507ce3c8da364e55931190263</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20052.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20057.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98cc270f5e08096729fc7d54ffafa9e3c6576316</Sha>
<Sha>d0833c8e5e58cfc507ce3c8da364e55931190263</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20052.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20057.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>98cc270f5e08096729fc7d54ffafa9e3c6576316</Sha>
<Sha>d0833c8e5e58cfc507ce3c8da364e55931190263</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
</PropertyGroup>
<!-- Arcade -->
<PropertyGroup>
<MicrosoftDotNetGenFacadesPackageVersion>5.0.0-beta.20052.1</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20052.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>5.0.0-beta.20052.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>5.0.0-beta.20057.5</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20057.5</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>5.0.0-beta.20057.5</MicrosoftDotNetXUnitExtensionsPackageVersion>
</PropertyGroup>
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->
<!-- XUnit-related (not extensions) -->
Expand Down
38 changes: 15 additions & 23 deletions eng/common/templates/post-build/channels/generic-internal-channel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,15 @@ stages:
vmImage: 'windows-2019'
steps:
- task: DownloadBuildArtifacts@0
displayName: Download Blob Artifacts
inputs:
artifactName: 'BlobArtifacts'
displayName: Download Build Assets
continueOnError: true

- task: DownloadBuildArtifacts@0
displayName: Download PDB Artifacts
inputs:
artifactName: 'PDBArtifacts'
continueOnError: true
buildType: 'current'
downloadType: 'specific'
itemPattern: |
PDBArtifacts/**
BlobArtifacts/**
downloadPath: '$(Build.ArtifactStagingDirectory)'

# This is necessary whenever we want to publish/restore to an AzDO private feed
# Since sdk-task.ps1 tries to restore packages we need to do this authentication here
Expand Down Expand Up @@ -85,23 +84,16 @@ stages:
vmImage: 'windows-2019'
steps:
- task: DownloadBuildArtifacts@0
displayName: Download Package Artifacts
inputs:
buildType: current
artifactName: PackageArtifacts
continueOnError: true

- task: DownloadBuildArtifacts@0
displayName: Download Blob Artifacts
inputs:
buildType: current
artifactName: BlobArtifacts
displayName: Download Build Assets
continueOnError: true
- task: DownloadBuildArtifacts@0
displayName: Download Asset Manifests
inputs:
buildType: current
artifactName: AssetManifests
buildType: 'current'
downloadType: 'specific'
itemPattern: |
PackageArtifacts/**
BlobArtifacts/**
AssetManifests/**
downloadPath: '$(Build.ArtifactStagingDirectory)'

- task: NuGetToolInstaller@1
displayName: 'Install NuGet.exe'
Expand Down
39 changes: 15 additions & 24 deletions eng/common/templates/post-build/channels/generic-public-channel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,15 @@ stages:
vmImage: 'windows-2019'
steps:
- task: DownloadBuildArtifacts@0
displayName: Download Blob Artifacts
inputs:
artifactName: 'BlobArtifacts'
displayName: Download Build Assets
continueOnError: true

- task: DownloadBuildArtifacts@0
displayName: Download PDB Artifacts
inputs:
artifactName: 'PDBArtifacts'
continueOnError: true
buildType: 'current'
downloadType: 'specific'
itemPattern: |
PDBArtifacts/**
BlobArtifacts/**
downloadPath: '$(Build.ArtifactStagingDirectory)'

# This is necessary whenever we want to publish/restore to an AzDO private feed
# Since sdk-task.ps1 tries to restore packages we need to do this authentication here
Expand Down Expand Up @@ -84,24 +83,16 @@ stages:
vmImage: 'windows-2019'
steps:
- task: DownloadBuildArtifacts@0
displayName: Download Package Artifacts
inputs:
buildType: current
artifactName: PackageArtifacts
displayName: Download Build Assets
continueOnError: true

- task: DownloadBuildArtifacts@0
displayName: Download Blob Artifacts
inputs:
buildType: current
artifactName: BlobArtifacts
continueOnError: true

- task: DownloadBuildArtifacts@0
displayName: Download Asset Manifests
inputs:
buildType: current
artifactName: AssetManifests
buildType: 'current'
downloadType: 'specific'
itemPattern: |
PackageArtifacts/**
BlobArtifacts/**
AssetManifests/**
downloadPath: '$(Build.ArtifactStagingDirectory)'

- task: NuGetToolInstaller@1
displayName: 'Install NuGet.exe'
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"version": "5.0.100-alpha1-015536"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20052.1",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20052.1",
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20057.5",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20057.5",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19513.3"
},
Expand Down