Skip to content

Use V3 for DncEng BAR publishing #3731

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
zivkan merged 18 commits into from
Oct 30, 2020
Merged

Use V3 for DncEng BAR publishing #3731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a8695af
V3 publishing
epananth Oct 14, 2020
2e4318b
Test V3
epananth Oct 14, 2020
3b0c3bc
Merge branch 'dev' of https://github.com/NuGet/NuGet.Client into v3
epananth Oct 14, 2020
69c2ea1
added repo name
epananth Oct 15, 2020
fb5a5f9
Merge branch 'dev' of https://github.com/NuGet/NuGet.Client into v3
epananth Oct 23, 2020
53ed401
updated maestro task
epananth Oct 23, 2020
45af9df
updated sdk
epananth Oct 26, 2020
cab89e6
updated maestro task
epananth Oct 27, 2020
c654747
Updated maestro task again
epananth Oct 28, 2020
5968666
Merge branch 'dev' of https://github.com/NuGet/NuGet.Client into v3
epananth Oct 28, 2020
8d2aef8
added new param to PushMetadataToBAR
epananth Oct 28, 2020
38f61c8
assetVersion updated
epananth Oct 28, 2020
07465af
reverting test configs
epananth Oct 28, 2020
724fb0e
Merge branch 'dev' of https://github.com/NuGet/NuGet.Client into v3
epananth Oct 28, 2020
42c5358
updated feed version to latest
epananth Oct 28, 2020
8908922
Merge branch 'dev' of https://github.com/NuGet/NuGet.Client into v3
epananth Oct 29, 2020
c616e30
updated version
epananth Oct 29, 2020
0241bf9
removed condition for version
epananth Oct 29, 2020
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
1 change: 1 addition & 0 deletions NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<add key="vside_vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
<add key="vside_vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />

<!-- Microsoft.VisualStudio.ProjectSystem.Managed* from roslyn. moving to vs-impl with new versions soon. -->
<add key="dotnet-roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
Expand Down
4 changes: 2 additions & 2 deletions build/bootstrap.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<PackageDownload Include="Lucene.Net" version="[3.0.3]" />
<PackageDownload Include="MicroBuild.Core" version="[0.2.0]" />
<PackageDownload Include="Microsoft.Build" version="[15.1.262-preview5]" />
<PackageDownload Include="Microsoft.DotNet.Build.Tasks.Feed" version="[5.0.0-beta.20224.2]" /> <!-- for publishing to the .NET Core build asset registry (BAR) -->
<PackageDownload Include="Microsoft.DotNet.Maestro.Tasks" version="[1.1.0-beta.20352.2]" /> <!-- for publishing to the .NET Core build asset registry (BAR) -->
<PackageDownload Include="Microsoft.DotNet.Build.Tasks.Feed" version="[6.0.0-beta.20528.5]" /> <!-- for publishing to the .NET Core build asset registry (BAR) -->
<PackageDownload Include="Microsoft.DotNet.Maestro.Tasks" version="[1.1.0-beta.20528.3]" /> <!-- for publishing to the .NET Core build asset registry (BAR) -->
<PackageDownload Include="Microsoft.VisualStudio.Composition" version="[16.4.11]" />
<PackageDownload Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" version="[14.3.26930]" />
<PackageDownload Include="Microsoft.VisualStudio.ProjectSystem" version="[16.7.156-pre]" />
Expand Down
5 changes: 2 additions & 3 deletions build/common.project.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
<LocalizationRootDirectory>$(NuGetBuildLocalizationRepository)localize</LocalizationRootDirectory>
<LocalizationFilesDirectory>$(ArtifactsDirectory)LocalizedFiles</LocalizationFilesDirectory>
<MicroBuildDirectory>$(SolutionPackagesFolder)microbuild.core\0.2.0\build\</MicroBuildDirectory>
<MicrosoftDotNetBuildTasksFeedFilePath>$(SolutionPackagesFolder)microsoft.dotnet.build.tasks.feed\5.0.0-beta.20224.2\tools\netcoreapp2.1\Microsoft.DotNet.Build.Tasks.Feed.dll</MicrosoftDotNetBuildTasksFeedFilePath>
<MicrosoftDotNetMaestroTasksFilePath>$(SolutionPackagesFolder)microsoft.dotnet.maestro.tasks\1.1.0-beta.20352.2\tools\netcoreapp3.1\Microsoft.DotNet.Maestro.Tasks.dll</MicrosoftDotNetMaestroTasksFilePath>
<MicrosoftDotNetBuildTasksFeedFilePath>$(SolutionPackagesFolder)microsoft.dotnet.build.tasks.feed\6.0.0-beta.20528.5\tools\netcoreapp2.1\Microsoft.DotNet.Build.Tasks.Feed.dll</MicrosoftDotNetBuildTasksFeedFilePath>
<MicrosoftDotNetMaestroTasksFilePath>$(SolutionPackagesFolder)microsoft.dotnet.maestro.tasks\1.1.0-beta.20528.3\tools\netcoreapp3.1\Microsoft.DotNet.Maestro.Tasks.dll</MicrosoftDotNetMaestroTasksFilePath>
<NoWarn>$(NoWarn);NU5105;NU5048</NoWarn>
</PropertyGroup>

Expand Down Expand Up @@ -143,7 +143,6 @@

<PropertyGroup Condition=" '$(Version)' == '' ">
<Version>$(SemanticVersion)$(PreReleaseInformationVersion)</Version>
<Version Condition="'$(BUILD_SOURCEVERSION)' != '' AND '$(IsCommandLinePackage)' != 'true'">$(SemanticVersion)$(PreReleaseInformationVersion)+$(BUILD_SOURCEVERSION)</Version>
Copy link
Member

@zivkan zivkan Oct 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In case anyone in my team sees this and wonders why, there's no benefit to adding the commit hash to the end of the string. Looking at nuget.org, no other packages do this, including System.* packages from the dotnet team. Our nuspec still has the commit hash, to enable source link, so anyone who really wants the commit hash can still get it.

</PropertyGroup>

<PropertyGroup>
Expand Down
9 changes: 5 additions & 4 deletions build/publish.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,23 @@
<ManifestBuildData Include="AzureDevOpsBuildNumber=$(BUILD_BUILDNUMBER)" />
<ManifestBuildData Include="AzureDevOpsRepository=$(BUILD_REPOSITORY_URI)" />
<ManifestBuildData Include="AzureDevOpsBranch=$(BUILD_SOURCEBRANCH)" />
<ManifestBuildData Include="PublishingVersion=2"/>
</ItemGroup>

<PushToAzureDevOpsArtifacts
ItemsToPush="@(ItemsToPush)"
ManifestBuildData="@(ManifestBuildData)"
ManifestRepoUri="$(BUILD_REPOSITORY_URI)"
ManifestRepoUri="$(BUILD_REPOSITORY_NAME)"
ManifestBranch="$(BUILD_SOURCEBRANCH)"
ManifestBuildId="$(BUILD_BUILDNUMBER)"
ManifestCommit="$(BUILD_SOURCEVERSION)"
AssetManifestPath="$(AssetManifestPath)" />
AssetManifestPath="$(AssetManifestPath)"
PublishingVersion="3" />

<PushMetadataToBuildAssetRegistry
BuildAssetRegistryToken="$(MaestroAccessToken)"
MaestroApiEndpoint="$(MaestroApiEndpoint)"
ManifestsPath="$(ArtifactsLogDir)AssetManifest\" />
ManifestsPath="$(ArtifactsLogDir)AssetManifest\"
AssetVersion="$(Version)" />
</Target>

</Project>
2 changes: 1 addition & 1 deletion build/templates/Build_and_UnitTest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ steps:
- task: CmdLine@2
displayName: "Publish to the .NET Core build asset registry (BAR)"
inputs:
script: dotnet msbuild $(Build.Repository.LocalPath)\build\publish.proj /t:PublishToBuildAssetRegistry /p:NuGetClientNupkgsDirectoryPath=$(Build.Repository.LocalPath)\artifacts\$(NupkgOutputDir) /p:BUILD_BUILDNUMBER=$(Build.BuildNumber) /p:BUILD_SOURCEBRANCH=$(Build.SourceBranchName) /p:BUILD_SOURCEVERSION=$(Build.SourceVersion) /p:BUILD_REPOSITORY_URI=$(Build.Repository.Uri) /p:ArtifactsLogDir=$(Build.Repository.LocalPath)\artifacts\manifests\ /p:MaestroApiEndpoint=$(MaestroApiEndpoint) /p:MaestroAccessToken=$(MaestroAccessToken)
script: dotnet msbuild $(Build.Repository.LocalPath)\build\publish.proj /t:PublishToBuildAssetRegistry /p:NuGetClientNupkgsDirectoryPath=$(Build.Repository.LocalPath)\artifacts\$(NupkgOutputDir) /p:BUILD_BUILDNUMBER=$(Build.BuildNumber) /p:BUILD_SOURCEBRANCH=$(Build.SourceBranchName) /p:BUILD_SOURCEVERSION=$(Build.SourceVersion) /p:BUILD_REPOSITORY_URI=$(Build.Repository.Uri) /p:BUILD_REPOSITORY_NAME=$(Build.Repository.Name) /p:ArtifactsLogDir=$(Build.Repository.LocalPath)\artifacts\manifests\ /p:MaestroApiEndpoint=$(MaestroApiEndpoint) /p:MaestroAccessToken=$(MaestroAccessToken)
workingDirectory: cli
failOnStderr: true
env:
Expand Down