Skip to content

[master] Update dependencies from dotnet/arcade #4050

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
merged 1 commit into from
Jan 21, 2021
Merged

[master] Update dependencies from dotnet/arcade #4050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -99,25 +99,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21068.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>298c72b33f6f7b742b11f7b1c0ae77a043789fcf</Sha>
<Sha>ee0a6a7d9acc6f5886ae214b935f3e3d989235e4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21068.2">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>298c72b33f6f7b742b11f7b1c0ae77a043789fcf</Sha>
<Sha>ee0a6a7d9acc6f5886ae214b935f3e3d989235e4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21068.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>298c72b33f6f7b742b11f7b1c0ae77a043789fcf</Sha>
<Sha>ee0a6a7d9acc6f5886ae214b935f3e3d989235e4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21068.2">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>298c72b33f6f7b742b11f7b1c0ae77a043789fcf</Sha>
<Sha>ee0a6a7d9acc6f5886ae214b935f3e3d989235e4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21068.2">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>298c72b33f6f7b742b11f7b1c0ae77a043789fcf</Sha>
<Sha>ee0a6a7d9acc6f5886ae214b935f3e3d989235e4</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 @@ -43,9 +43,9 @@
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21068.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.21068.2</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21068.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21069.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.21069.2</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21069.2</MicrosoftDotNetGenAPIVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
<PropertyGroup>
Expand Down
3 changes: 3 additions & 0 deletions eng/common/templates/post-build/post-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,9 @@ stages:
pipeline: $(AzDOPipelineId)
buildId: $(AzDOBuildId)
artifactName: PackageArtifacts
itemPattern: |
**
!**/Microsoft.SourceBuild.Intermediate.*.nupkg

# 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
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 @@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21068.2",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21068.2"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21069.2",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21069.2"
},
"sdk": {
"version": "5.0.100"
Expand Down