Skip to content

[master] Update dependencies from dotnet/arcade #881

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
zsd4yr merged 1 commit into from
Apr 25, 2019
Merged

[master] Update dependencies from dotnet/arcade #881

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
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,21 +63,21 @@ 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="1.0.0-beta.19223.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19224.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e3919d0c158716ef4685c8e057cc58640af1af83</Sha>
<Sha>e02c88fca482f1141a9bb310c97be20b0ebd0465</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19223.2">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19224.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e3919d0c158716ef4685c8e057cc58640af1af83</Sha>
<Sha>e02c88fca482f1141a9bb310c97be20b0ebd0465</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19223.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19224.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e3919d0c158716ef4685c8e057cc58640af1af83</Sha>
<Sha>e02c88fca482f1141a9bb310c97be20b0ebd0465</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-beta.19223.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-beta.19224.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e3919d0c158716ef4685c8e057cc58640af1af83</Sha>
<Sha>e02c88fca482f1141a9bb310c97be20b0ebd0465</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
</PropertyGroup>
<!-- Arcade -->
<PropertyGroup>
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19223.2</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.0-beta.19223.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19224.9</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.0-beta.19224.9</MicrosoftDotNetXUnitExtensionsPackageVersion>
</PropertyGroup>
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->
<!-- XUnit-related (not extensions) -->
Expand Down
7 changes: 6 additions & 1 deletion eng/common/templates/job/job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,12 @@ parameters:
# Optional: enable sending telemetry
enableTelemetry: false

# Optional: define the helix repo for telemeetry (example: 'dotnet/arcade')
# Optional: define the helix repo for telemetry (example: 'dotnet/arcade')
helixRepo: ''

# Optional: define the helix type for telemetry (example: 'build/product/')
helixType: ''

# Required: name of the job
name: ''

Expand Down Expand Up @@ -122,6 +125,8 @@ jobs:
displayName: 'Send Helix Start Telemetry'
inputs:
helixRepo: ${{ parameters.helixRepo }}
${{ if ne(parameters.helixType, '') }}:
helixType: ${{ parameters.helixType }}
buildConfig: $(_BuildConfig)
runAsPublic: ${{ parameters.runAsPublic }}
continueOnError: ${{ parameters.continueOnError }}
Expand Down
51 changes: 0 additions & 51 deletions eng/common/templates/steps/helix-publish.yml
View file
Open in desktop

This file was deleted.

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 @@ -10,8 +10,8 @@
"version": "3.0.100-preview5-011162"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19223.2",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19223.2",
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19224.9",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19224.9",
"Microsoft.NET.Sdk.IL": "3.0.0-preview6-27624-71"
}
}