diff --git a/.vsts-dnup-ci.yml b/.vsts-dnup-ci.yml index 6af482154a3c..e3c570bf7e2f 100644 --- a/.vsts-dnup-ci.yml +++ b/.vsts-dnup-ci.yml @@ -133,4 +133,4 @@ extends: pool: name: $(DncEngInternalBuildPool) image: 1es-windows-2022 - os: windows + os: windows \ No newline at end of file diff --git a/.vsts-dnup-pr.yml b/.vsts-dnup-pr.yml index be58e8dfa3a2..2cd23a4ca40f 100644 --- a/.vsts-dnup-pr.yml +++ b/.vsts-dnup-pr.yml @@ -7,12 +7,6 @@ pr: include: - dnup - release/dnup - paths: - include: - - src/Installer/dnup/ - - test/dnup.Tests/ - - global.json - - .vsts-dnup-tests.yml parameters: - name: enableArm64Job diff --git a/eng/pipelines/templates/jobs/dnup/dnup-library-package.yml b/eng/pipelines/templates/jobs/dnup/dnup-library-package.yml index 9d649a7b06d9..4645d5f0f935 100644 --- a/eng/pipelines/templates/jobs/dnup/dnup-library-package.yml +++ b/eng/pipelines/templates/jobs/dnup/dnup-library-package.yml @@ -31,6 +31,8 @@ jobs: enableSbom: ${{ parameters.enableSbom }} variables: - ${{ insert }}: ${{ parameters.variables }} + - name: _officialBuildProperties + value: /p:OfficialBuilder=Microsoft /p:OfficialBuildId=$(Build.BuildNumber) dependsOn: ${{ parameters.dependsOn }} preSteps: ${{ parameters.preSteps }} templateContext: @@ -44,17 +46,30 @@ jobs: targetPath: '$(Build.SourcesDirectory)/artifacts/packages/Release/NonShipping/' artifactName: 'dnup-library-packages' publishLocation: Container + - output: pipelineArtifact + displayName: '📊 Publish dnup library build binlogs' + condition: always() + targetPath: '$(Build.SourcesDirectory)/artifacts/binlogs/' + artifactName: 'dnup-library-binlogs' + publishLocation: Container steps: - ${{ if eq(parameters.pool.os, 'windows') }}: - powershell: | - & .\restore.cmd + & .\restore.cmd $(_officialBuildProperties) displayName: 🍱 Bootstrap toolset (Windows) - powershell: | - & .\.dotnet\dotnet build test\dnup.Tests\dnup.Tests.csproj -c Release + & .\.dotnet\dotnet build test\dnup.Tests\dnup.Tests.csproj -c Release -bl:$(Build.SourcesDirectory)/artifacts/binlogs/dnup-library-build.binlog $(_officialBuildProperties) displayName: 💻 Build Windows - powershell: | - & .\.dotnet\dotnet pack .\src\Installer\Microsoft.Dotnet.Installation\Microsoft.Dotnet.Installation.csproj + & .\.dotnet\dotnet pack .\src\Installer\Microsoft.Dotnet.Installation\Microsoft.Dotnet.Installation.csproj -bl:$(Build.SourcesDirectory)/artifacts/binlogs/dnup-library-package.binlog $(_officialBuildProperties) displayName: 📦 Package dnup library - powershell: | - & .\.dotnet\dotnet build .\src\Installer\Microsoft.Dotnet.Installation\Microsoft.Dotnet.Installation.sign.proj /t:Sign + & .\.dotnet\dotnet build .\src\Installer\Installer.sign.proj /t:Sign -bl:$(Build.SourcesDirectory)/artifacts/binlogs/dnup-library-sign.binlog $(_officialBuildProperties) displayName: 🖋️ Sign dnup library packages with arcade signtool + - task: 1ES.PublishNuget@1 + displayName: 🟣 Publish packages to AzDO + inputs: + useDotNetTask: true + packagesToPush: '$(Build.SourcesDirectory)/artifacts/packages/Release/**/*.nupkg;!$(Build.SourcesDirectory)/artifacts/packages/Release/**/*.symbols.nupkg' + packageParentPath: $(Build.SourcesDirectory)/artifacts/packages/Release + publishVstsFeed: public/dotnet-tools diff --git a/src/Installer/Microsoft.Dotnet.Installation/Microsoft.Dotnet.Installation.sign.proj b/src/Installer/Installer.sign.proj similarity index 75% rename from src/Installer/Microsoft.Dotnet.Installation/Microsoft.Dotnet.Installation.sign.proj rename to src/Installer/Installer.sign.proj index baea2590e599..bdae83fe8dbd 100644 --- a/src/Installer/Microsoft.Dotnet.Installation/Microsoft.Dotnet.Installation.sign.proj +++ b/src/Installer/Installer.sign.proj @@ -1,17 +1,13 @@  net10.0 - - <_RepoRoot Condition="'$(RepoRoot)' != ''">$(RepoRoot) - <_RepoRoot Condition="'$(_RepoRoot)' == ''">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\..\')) - - $(_RepoRoot)artifacts\packages\Release\ - $(_RepoRoot)artifacts\obj\Sign\ - $(_RepoRoot)artifacts\log\Sign\ + $(RepoRoot)artifacts\packages\Release\ + $(RepoRoot)artifacts\obj\Sign\ + $(RepoRoot)artifacts\log\Sign\ - $(_RepoRoot).dotnet\dotnet.exe + $(RepoRoot).dotnet\dotnet.exe true true diff --git a/src/Installer/Microsoft.Dotnet.Installation/Microsoft.Dotnet.Installation.csproj b/src/Installer/Microsoft.Dotnet.Installation/Microsoft.Dotnet.Installation.csproj index 42197569ad78..c9b2c6d4509f 100644 --- a/src/Installer/Microsoft.Dotnet.Installation/Microsoft.Dotnet.Installation.csproj +++ b/src/Installer/Microsoft.Dotnet.Installation/Microsoft.Dotnet.Installation.csproj @@ -13,8 +13,8 @@ Microsoft.Dotnet.Installation false .NET Installation Library - 1.0.0-alpha - $(Version) + 0.1.0 + preview