Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Set up auto-update for infrastructure packages #7824

Merged
dagood merged 2 commits into from
Aug 26, 2019
Merged

Set up auto-update for infrastructure packages #7824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17497ff
Set up auto-update for infra packages
dagood Aug 22, 2019
776b9c4
React to packaging tools centralizing specs
dagood Aug 22, 2019
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: 16 additions & 0 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,5 +127,21 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c7f03b2cf06bdfc64dad4140fd0d486127095cd8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19422.24">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c7f03b2cf06bdfc64dad4140fd0d486127095cd8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19422.24">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c7f03b2cf06bdfc64dad4140fd0d486127095cd8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19422.24">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c7f03b2cf06bdfc64dad4140fd0d486127095cd8</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceLink" Version="1.0.0-beta2-19367-01">
<Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha></Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
10 changes: 5 additions & 5 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,11 @@
<!--Package versions-->
<PropertyGroup>
<!-- arcade -->
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19308.1</MicrosoftDotNetBuildTasksPackagingPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-beta.19410.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19308.1</MicrosoftDotNetVersionToolsTasksPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-beta.19422.24</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19422.24</MicrosoftDotNetBuildTasksPackagingPackageVersion>
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19422.24</MicrosoftDotNetVersionToolsTasksPackageVersion>
<!-- sourcelink -->
<MicrosoftSourceLinkVersion>1.0.0-beta2-19367-01</MicrosoftSourceLinkVersion>
<!-- corefx -->
<MicrosoftNETCorePlatformsPackageVersion>5.0.0-alpha1.19409.9</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreTargetsPackageVersion>5.0.0-alpha1.19409.9</MicrosoftNETCoreTargetsPackageVersion>
Expand Down Expand Up @@ -85,8 +87,6 @@
<NugetPackagingPackageVersion>4.9.4</NugetPackagingPackageVersion>
<MicrosoftTargetingPackPrivateWinRTPackageVersion>1.0.5</MicrosoftTargetingPackPrivateWinRTPackageVersion>
<MicrosoftDiaSymReaderNativePackageVersion>1.7.0</MicrosoftDiaSymReaderNativePackageVersion>
<!-- Infrastructure and test-only. -->
<MicrosoftSourceLinkVersion>1.0.0-beta2-18618-05</MicrosoftSourceLinkVersion>
</PropertyGroup>
<!--Package names-->
<PropertyGroup>
Expand Down
4 changes: 3 additions & 1 deletion eng/jobs/steps/upload-job-artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ steps:
displayName: Prepare job-specific Artifacts subdirectory
inputs:
SourceFolder: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)'
Contents: '**/*'
Contents: |
Shipping/**/*
NonShipping/**/*
TargetFolder: '$(Build.StagingDirectory)/Artifacts/${{ parameters.name }}'
CleanTargetFolder: true
condition: and(succeeded(), eq(variables._BuildConfig, 'Release'))
Expand Down
4 changes: 2 additions & 2 deletions src/test/Microsoft.DotNet.CoreSetup.Packaging.Tests/NuGetArtifactTester.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ public static NuGetArtifactTester OpenOrNull(
id = id ?? project;

string nuspecPath = Path.Combine(
dirs.BaseBinFolder,
project,
dirs.BaseArtifactsFolder,
"packages",
dirs.Configuration,
"specs",
$"{id}.nuspec");
Expand Down