Skip to content
This repository was archived by the owner on Sep 13, 2022. It is now read-only.

[master] Update dependencies from dotnet/arcade #1168

Merged
dotnet-maestro merged 1 commit into from
Apr 25, 2019
Merged

[master] Update dependencies from dotnet/arcade #1168

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 @@ -3,25 +3,25 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<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.ApiCompat" Version="1.0.0-beta.19223.2">
<Dependency Name="Microsoft.DotNet.ApiCompat" 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.Build.Tasks.Packaging" Version="1.0.0-beta.19223.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" 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.CodeAnalysis" Version="1.0.0-beta.19223.2">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" 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.GenAPI" Version="1.0.0-beta.19223.2">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19224.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e3919d0c158716ef4685c8e057cc58640af1af83</Sha>
<Sha>e02c88fca482f1141a9bb310c97be20b0ebd0465</Sha>
</Dependency>
<PinnedDependency Name="NETStandard.Library" Version="2.0.3">
<Uri>https://github.com/dotnet/standard</Uri>
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
<NetStandardLibraryPackage>netstandard.library</NetStandardLibraryPackage>
</PropertyGroup>
<PropertyGroup>
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19223.2</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19223.2</MicrosoftDotNetBuildTasksPackagingPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19223.2</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19223.2</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19224.9</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19224.9</MicrosoftDotNetBuildTasksPackagingPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19224.9</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19224.9</MicrosoftDotNetGenAPIPackageVersion>
<!-- This is the LKG stable version of NetStandard.Library from myget.org. Please don't edit this version -->
<NetStandardLibraryPackageVersion>2.0.3</NetStandardLibraryPackageVersion>
</PropertyGroup>
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.

2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"dotnet": "2.1.503"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19223.2"
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19224.9"
}
}