Skip to content

Commit

Permalink
Merge pull request #9367 from dotnet/darc-master-fac85c9a-a1af-4a0c-9…
Browse files Browse the repository at this point in the history
…f2a-999461715ed2

[master] Update dependencies from dotnet/arcade
  • Loading branch information
KevinRansom authored Jun 2, 2020
2 parents e9b0078 + 8e7ee20 commit f3d4754
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20278.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20301.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>77bfd5a60e0691b0cebd180a0fd85eb65fa7f362</Sha>
<Sha>e4cb18bd64d291e5dc34e2f77317c33d5022a6b8</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
12 changes: 12 additions & 0 deletions eng/common/templates/post-build/post-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -354,3 +354,15 @@ stages:
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'

- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
parameters:
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
stageName: 'VS_Master_Publishing'
channelName: 'VS Master'
channelId: 1012
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20278.5",
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20301.10",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
}
}

0 comments on commit f3d4754

Please sign in to comment.