Skip to content

[release/3.0] Update dependencies from dotnet/arcade #2172

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
dotnet-maestro merged 1 commit into from
Aug 12, 2019
Merged

[release/3.0] Update dependencies from dotnet/arcade #2172

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
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,17 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19404.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19411.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b1c2f33f0cef32d1df6e7f388017fd6761d3fcad</Sha>
<Sha>a11024c8c22cc762011addafc30c653c938048f4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19404.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19411.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b1c2f33f0cef32d1df6e7f388017fd6761d3fcad</Sha>
<Sha>a11024c8c22cc762011addafc30c653c938048f4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19404.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19411.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b1c2f33f0cef32d1df6e7f388017fd6761d3fcad</Sha>
<Sha>a11024c8c22cc762011addafc30c653c938048f4</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview9.19409.17" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<!-- Workaround https://github.com/dotnet/cli/issues/10528-->
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview9.19409.17</MicrosoftNETCorePlatformsPackageVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19404.1</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19411.1</MicrosoftDotNetGenAPIPackageVersion>
<!-- Packages from dotnet/roslyn -->
<MicrosoftNetCompilersToolsetVersion>3.3.0-beta3-19409-05</MicrosoftNetCompilersToolsetVersion>
</PropertyGroup>
Expand Down
2 changes: 2 additions & 0 deletions eng/common/templates/job/execute-sdl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ jobs:
displayName: Run SDL tool
variables:
- group: DotNet-VSTS-Bot
pool:
name: Hosted VS2017
steps:
- checkout: self
clean: true
Expand Down
1 change: 1 addition & 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 @@ -52,6 +52,7 @@ stages:
filePath: eng\common\sdk-task.ps1
arguments: -task SigningValidation -restore -msbuildEngine dotnet
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts'
/p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt'
/p:Configuration=Release

- ${{ if eq(parameters.enableSourceLinkValidation, 'true') }}:
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 @@ -11,7 +11,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19404.1",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19404.1"
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19411.1",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19411.1"
}
}