From e90465acd44c421921f48cca04fc4c7e73dd7034 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Mon, 1 May 2023 22:48:46 -0600 Subject: [PATCH 01/20] Update Dockerfile --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 7ffd07ef..01c94a90 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,5 +1,5 @@ # Refer to https://hub.docker.com/_/microsoft-dotnet-sdk for available versions -FROM mcr.microsoft.com/dotnet/sdk:7.0.101-jammy +FROM mcr.microsoft.com/dotnet/sdk:7.0.203-jammy # Installing mono makes `dotnet test` work without errors even for net472. # But installing it takes a long time, so it's excluded by default. From 46b4f565e380906d043528f2442c0cb1591f585c Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Tue, 2 May 2023 07:41:53 -0600 Subject: [PATCH 02/20] Fix placement of $RestoreArguments construction --- init.ps1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/init.ps1 b/init.ps1 index 6211304f..00a9589b 100755 --- a/init.ps1 +++ b/init.ps1 @@ -83,13 +83,13 @@ Push-Location $PSScriptRoot try { $HeaderColor = 'Green' - if (!$NoRestore -and $PSCmdlet.ShouldProcess("NuGet packages", "Restore")) { - $RestoreArguments = @() - if ($Interactive) - { - $RestoreArguments += '--interactive' - } + $RestoreArguments = @() + if ($Interactive) + { + $RestoreArguments += '--interactive' + } + if (!$NoRestore -and $PSCmdlet.ShouldProcess("NuGet packages", "Restore")) { Write-Host "Restoring NuGet packages" -ForegroundColor $HeaderColor dotnet restore @RestoreArguments if ($lastexitcode -ne 0) { From 4d4c330486ea2fe98d9ae70ed1c05fb5bba31c92 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Thu, 11 May 2023 08:51:17 -0600 Subject: [PATCH 03/20] Switch from `MSBuildTreatWarningsAsErrors` to `-warnaserror` This is per @rainersigwald's suggestion in https://github.com/dotnet/msbuild/issues/8735#issuecomment-1544076504 --- .github/workflows/build.yml | 3 +-- azure-pipelines.yml | 1 - azure-pipelines/dotnet.yml | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3fc278de..33502820 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,6 @@ on: pull_request: env: - MSBuildTreatWarningsAsErrors: true DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true BUILDCONFIGURATION: Release # codecov_token: 4dc9e7e2-6b01-4932-a180-847b52b43d35 # Get a new one from https://codecov.io/ @@ -44,7 +43,7 @@ jobs: run: azure-pipelines/variables/_pipelines.ps1 shell: pwsh - name: ๐Ÿ›  build - run: dotnet build -t:build,pack --no-restore -c ${{ env.BUILDCONFIGURATION }} /v:m /bl:"${{ runner.temp }}/_artifacts/build_logs/build.binlog" + run: dotnet build -t:build,pack --no-restore -c ${{ env.BUILDCONFIGURATION }} -warnaserror /bl:"${{ runner.temp }}/_artifacts/build_logs/build.binlog" - name: ๐Ÿงช test run: azure-pipelines/dotnet-test-cloud.ps1 -Configuration ${{ env.BUILDCONFIGURATION }} -Agent ${{ runner.os }} shell: pwsh diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 521d4ce6..9867b3db 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -23,7 +23,6 @@ parameters: default: true variables: - MSBuildTreatWarningsAsErrors: true DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true BuildConfiguration: Release codecov_token: 4dc9e7e2-6b01-4932-a180-847b52b43d35 # Get a new one from https://codecov.io/ diff --git a/azure-pipelines/dotnet.yml b/azure-pipelines/dotnet.yml index 79babd4d..51241549 100644 --- a/azure-pipelines/dotnet.yml +++ b/azure-pipelines/dotnet.yml @@ -3,7 +3,7 @@ parameters: steps: -- script: dotnet build -t:build,pack --no-restore -c $(BuildConfiguration) /bl:"$(Build.ArtifactStagingDirectory)/build_logs/build.binlog" +- script: dotnet build -t:build,pack --no-restore -c $(BuildConfiguration) -warnaserror /bl:"$(Build.ArtifactStagingDirectory)/build_logs/build.binlog" displayName: ๐Ÿ›  dotnet build - powershell: azure-pipelines/dotnet-test-cloud.ps1 -Configuration $(BuildConfiguration) -Agent $(Agent.JobName) -PublishResults From c84fe06b9701ea6ac7b6bebed8a6f5f0064c9561 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Wed, 17 May 2023 07:04:10 -0600 Subject: [PATCH 04/20] Fix BinSkim when ApiScan won't run --- azure-pipelines/secure-development-tools.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-pipelines/secure-development-tools.yml b/azure-pipelines/secure-development-tools.yml index 0ca483da..ce8ac94c 100644 --- a/azure-pipelines/secure-development-tools.yml +++ b/azure-pipelines/secure-development-tools.yml @@ -28,7 +28,6 @@ steps: !**/linux-*/** !**/osx*/** TargetFolder: $(Build.ArtifactStagingDirectory)/APIScanInputs - condition: and(succeeded(), ${{ parameters.EnableAPIScan }}, ne(variables.ApiScanClientId, '')) - task: BinSkim@4 displayName: ๐Ÿ” Run BinSkim From aefd199847243c1e0a6a8224db00ccb25a5bc9e0 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Wed, 17 May 2023 10:56:28 -0600 Subject: [PATCH 05/20] Bump .NET SDK to 7.0.302 --- .devcontainer/Dockerfile | 2 +- global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 01c94a90..6d2f30da 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,5 +1,5 @@ # Refer to https://hub.docker.com/_/microsoft-dotnet-sdk for available versions -FROM mcr.microsoft.com/dotnet/sdk:7.0.203-jammy +FROM mcr.microsoft.com/dotnet/sdk:7.0.302-jammy # Installing mono makes `dotnet test` work without errors even for net472. # But installing it takes a long time, so it's excluded by default. diff --git a/global.json b/global.json index c7d7e468..abde95a8 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.203", + "version": "7.0.302", "rollForward": "patch", "allowPrerelease": false } From 4406d85960e468f19f0868991757aae74fbf7224 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Thu, 18 May 2023 06:23:33 -0600 Subject: [PATCH 06/20] Parameterize and add diagnostics to InsertVersionsValues.ps1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's been failing ever since switching from `Get-Nbgv.ps1` to `dotnet tool run nbgv`, but only on Azure Pipelines, and only on certain commits. Quite literally, it fails repeatedly on some particular commit, and if I push a new *empty* commit, it succeeds. This makes me believe that somehow, the git database or git commit id itself or something is causing `nbgv` to fail. I have no idea why it would fail with this output though: ``` Computing InsertVersionsValues variable Option '--project' expects a single argument but 2 were provided. ConvertFrom-Json: /home/vsts/work/1/s/azure-pipelines/variables/InsertVersionsValues.ps1:2 Line | 2 | โ€ฆ oft.VisualStudio.Validation" --format json | ConvertFrom-Json).Assemb โ€ฆ | ~~~~~~~~~~~~~~~~ | Conversion from JSON failed with error: Unexpected character encountered | while parsing value: D. Path '', line 0, position 0. ``` The output suggests a malformed command line, but I simply see no possible way for that to happen. Nor can I repro it locally. --- .../variables/InsertVersionsValues.ps1 | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/azure-pipelines/variables/InsertVersionsValues.ps1 b/azure-pipelines/variables/InsertVersionsValues.ps1 index c3a03559..9bc7bc83 100644 --- a/azure-pipelines/variables/InsertVersionsValues.ps1 +++ b/azure-pipelines/variables/InsertVersionsValues.ps1 @@ -4,6 +4,30 @@ # your libraries as defined in the src\ProductData\AssemblyVersions.tt file. return -[string]::join(',',(@{ - ('LibraryNoDotsVersion') = & { (dotnet tool run nbgv get-version --project "$PSScriptRoot\..\..\src\LibraryName" --format json | ConvertFrom-Json).AssemblyVersion }; -}.GetEnumerator() |% { "$($_.key)=$($_.value)" })) +$MacroName = 'LibraryNoDotsVersion' +$SampleProject = "$PSScriptRoot\..\..\src\LibraryName" +try { + return [string]::join(',',(@{ + ($MacroName) = & { (dotnet tool run nbgv get-version --project $SampleProject --format json | ConvertFrom-Json).AssemblyVersion }; + }.GetEnumerator() |% { "$($_.key)=$($_.value)" })) +} +catch { + Write-Error $_ + Write-Error "Failed. Diagnostic data proceeds:" + [string]::join(',',(@{ + ($MacroName) = & { + Write-Host "dotnet tool run nbgv get-version --project `"$SampleProject`" --format json" + $result1 = dotnet tool run nbgv get-version --project $SampleProject --format json + Write-Host $result1 + $result2 = dotnet tool run nbgv get-version --project $SampleProject --format json | ConvertFrom-Json + Write-Host $result2 + Write-Host $result2.AssemblyVersion + Write-Host (dotnet tool run nbgv get-version --project $SampleProject --format json | ConvertFrom-Json).AssemblyVersion + Write-Output (dotnet tool run nbgv get-version --project $SampleProject --format json | ConvertFrom-Json).AssemblyVersion + }; + }.GetEnumerator() |% { "$($_.key)=$($_.value)" })) + + Write-Host "one more..." + $r = & { (dotnet tool run nbgv get-version --project $SampleProject --format json | ConvertFrom-Json).AssemblyVersion }; + Write-Host $r +} From b33fad3f1fab1559e672d4cacb92d763568a9bd3 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Fri, 19 May 2023 13:32:53 -0600 Subject: [PATCH 07/20] Fix schedule triggered source code archival --- azure-pipelines/Archive-SourceCode.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/Archive-SourceCode.ps1 b/azure-pipelines/Archive-SourceCode.ps1 index 0fec3e9b..9158c9b3 100644 --- a/azure-pipelines/Archive-SourceCode.ps1 +++ b/azure-pipelines/Archive-SourceCode.ps1 @@ -135,7 +135,7 @@ if (!$Requester) { $Requester = $env:USERNAME } if (!$Requester) { - Write-Error "Unable to determine default value for -Requester." + $Requester = $OwnerAlias } } From 8f6c4d6ba6875dc382b4ad7ea148c7871e3e7cc4 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Fri, 19 May 2023 16:38:05 -0600 Subject: [PATCH 08/20] Upgrade archive symbols task to v4 --- azure-pipelines/prepare-insertion-stages.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/azure-pipelines/prepare-insertion-stages.yml b/azure-pipelines/prepare-insertion-stages.yml index ed6b19c2..e194ff44 100644 --- a/azure-pipelines/prepare-insertion-stages.yml +++ b/azure-pipelines/prepare-insertion-stages.yml @@ -10,7 +10,7 @@ stages: condition: and(succeeded(), eq(dependencies.Build.outputs['Windows.SetPipelineVariables.SignType'], 'Real')) jobs: - job: archive - pool: VSEng-ReleasePool-1ES + pool: VSEngSS-MicroBuild2022-1ES steps: - checkout: none - download: current @@ -21,14 +21,13 @@ stages: - download: current artifact: symbols-legacy displayName: ๐Ÿ”ป Download symbols-legacy artifact - - task: MicroBuildArchiveSymbols@1 + - task: MicroBuildArchiveSymbols@4 displayName: ๐Ÿ”ฃ Archive symbols to Symweb inputs: SymbolsFeatureName: $(SymbolsFeatureName) - SymbolsSymwebProject: VS - SymbolsUncPath: \\cpvsbuild\drops\$(TeamName)\$(Build.DefinitionName)\$(Build.SourceBranchName)\$(Build.BuildId)\Symbols.Archival - SymbolsEmailContacts: vsidemicrobuild + SymbolsProject: VS SymbolsAgentPath: $(Pipeline.Workspace)/symbols-legacy + azureSubscription: Symbols Upload (DevDiv) - task: MicroBuildCleanup@1 displayName: โ˜Ž๏ธ Send Telemetry From b46d049fc37c9d0537ddb9b2b8653d2de8c88e14 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Fri, 19 May 2023 16:40:50 -0600 Subject: [PATCH 09/20] Consolidate two stages to just one --- azure-pipelines/prepare-insertion-stages.yml | 60 ++++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/azure-pipelines/prepare-insertion-stages.yml b/azure-pipelines/prepare-insertion-stages.yml index e194ff44..bb3a400c 100644 --- a/azure-pipelines/prepare-insertion-stages.yml +++ b/azure-pipelines/prepare-insertion-stages.yml @@ -4,12 +4,13 @@ parameters: default: true stages: -- ${{ if parameters.ArchiveSymbols }}: - - stage: symbol_archive - displayName: Symbol archival - condition: and(succeeded(), eq(dependencies.Build.outputs['Windows.SetPipelineVariables.SignType'], 'Real')) - jobs: - - job: archive +- stage: release + displayName: Publish + condition: and(succeeded(), eq(dependencies.Build.outputs['Windows.SetPipelineVariables.SignType'], 'Real')) + jobs: + - ${{ if parameters.ArchiveSymbols }}: + - job: symbol_archive + displayName: Archive symbols pool: VSEngSS-MicroBuild2022-1ES steps: - checkout: none @@ -31,28 +32,27 @@ stages: - task: MicroBuildCleanup@1 displayName: โ˜Ž๏ธ Send Telemetry -# - stage: azure_public_vsimpl_feed +# - job: push # displayName: azure-public/vs-impl feed -# condition: and(succeeded(), eq(dependencies.Build.outputs['Windows.SetPipelineVariables.SignType'], 'Real')) -# jobs: -# - job: push -# pool: -# name: AzurePipelines-EO -# vmImage: AzurePipelinesUbuntu20.04compliant -# steps: -# - checkout: none -# - download: current -# artifact: deployables-Windows -# displayName: ๐Ÿ”ป Download deployables-Windows artifact -# - task: UseDotNet@2 -# displayName: โš™๏ธ Install .NET SDK -# inputs: -# packageType: sdk -# version: 6.x -# - task: NuGetAuthenticate@1 -# displayName: ๐Ÿ” Authenticate NuGet feeds -# inputs: -# nuGetServiceConnections: azure-public/vs-impl -# forceReinstallCredentialProvider: true -# - script: dotnet nuget push $(Pipeline.Workspace)/deployables-Windows/NuGet/*.nupkg -s https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json --api-key azdo --skip-duplicate -# displayName: ๐Ÿ“ฆ Push nuget packages +# ${{ if parameters.ArchiveSymbols }}: +# dependsOn: symbol_archive +# pool: +# name: AzurePipelines-EO +# vmImage: AzurePipelinesUbuntu20.04compliant +# steps: +# - checkout: none +# - download: current +# artifact: deployables-Windows +# displayName: ๐Ÿ”ป Download deployables-Windows artifact +# - task: UseDotNet@2 +# displayName: โš™๏ธ Install .NET SDK +# inputs: +# packageType: sdk +# version: 6.x +# - task: NuGetAuthenticate@1 +# displayName: ๐Ÿ” Authenticate NuGet feeds +# inputs: +# nuGetServiceConnections: azure-public/vs-impl +# forceReinstallCredentialProvider: true +# - script: dotnet nuget push $(Pipeline.Workspace)/deployables-Windows/NuGet/*.nupkg -s https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json --api-key azdo --skip-duplicate +# displayName: ๐Ÿ“ฆ Push nuget packages From 354b522a12ab85fd819356484a63e7cf38ae2579 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Sat, 20 May 2023 13:25:55 -0600 Subject: [PATCH 10/20] Bump NB.GV to 3.6.132 --- .config/dotnet-tools.json | 2 +- Directory.Packages.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 54fc5886..93547faf 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -21,7 +21,7 @@ ] }, "nbgv": { - "version": "3.6.128", + "version": "3.6.132", "commands": [ "nbgv" ] diff --git a/Directory.Packages.props b/Directory.Packages.props index 5758824b..7cf54cc1 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -12,7 +12,7 @@ - + From 4f2a6d8391ae5f2b9a577bd3c3bbb03a201a4ff8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 May 2023 13:28:47 -0600 Subject: [PATCH 11/20] Bump CSharpIsNullAnalyzer from 0.1.329 to 0.1.495 (#204) * Crank up dependabot * Bump CSharpIsNullAnalyzer from 0.1.329 to 0.1.495 Bumps [CSharpIsNullAnalyzer](https://github.com/AArnott/CSharpIsNull) from 0.1.329 to 0.1.495. - [Release notes](https://github.com/AArnott/CSharpIsNull/releases) - [Commits](https://github.com/AArnott/CSharpIsNull/commits) --- updated-dependencies: - dependency-name: CSharpIsNullAnalyzer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: Andrew Arnott Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/dependabot.yml | 4 ++-- Directory.Packages.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b9b0f54a..63e3e890 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,9 +1,9 @@ # Please see the documentation for all configuration options: -# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates +# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file version: 2 updates: - package-ecosystem: nuget directory: / schedule: - interval: monthly + interval: weekly diff --git a/Directory.Packages.props b/Directory.Packages.props index 7cf54cc1..74916ca2 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -10,7 +10,7 @@ - + From 119ce0770abc0ad1a3b8bdab3ca622470579ec92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 May 2023 13:29:01 -0600 Subject: [PATCH 12/20] Bump Microsoft.NET.Test.Sdk from 17.5.0 to 17.6.0 (#202) * Crank up dependabot * Bump Microsoft.NET.Test.Sdk from 17.5.0 to 17.6.0 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.5.0 to 17.6.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.5.0...v17.6.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: Andrew Arnott Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 74916ca2..061f8ed4 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,7 +5,7 @@ true - + From 0991fe932a245d50f30ebab193a3cd50dc520939 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 May 2023 13:29:13 -0600 Subject: [PATCH 13/20] Bump dotnet-coverage from 17.7.0 to 17.7.1 (#205) * Crank up dependabot * Bump dotnet-coverage from 17.7.0 to 17.7.1 Bumps [dotnet-coverage](https://github.com/microsoft/codecoverage) from 17.7.0 to 17.7.1. - [Commits](https://github.com/microsoft/codecoverage/commits) --- updated-dependencies: - dependency-name: dotnet-coverage dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: Andrew Arnott Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .config/dotnet-tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 93547faf..5ed46cc1 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "dotnet-coverage": { - "version": "17.7.0", + "version": "17.7.1", "commands": [ "dotnet-coverage" ] From 2e6a2d1c2f93069381266ae7e49a4a4e6bf43b8c Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Mon, 22 May 2023 08:31:09 -0600 Subject: [PATCH 14/20] (Hopefully) fix `nbgv` failures with `--` argument separator I believe `dotnet tool run` may be stealing the `--project` parameter non-deterministically (perhaps due to string hashing inputs that change in every process). By adding `--` in front of all parameters for the `nbgv` tool, I believe and hope this will resolve the issue by forcing the command line parser to interpret all subsequent command line arguments to be directed to `nbgv`. --- .../variables/InsertVersionsValues.ps1 | 28 ++----------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/azure-pipelines/variables/InsertVersionsValues.ps1 b/azure-pipelines/variables/InsertVersionsValues.ps1 index 9bc7bc83..2eb2fcea 100644 --- a/azure-pipelines/variables/InsertVersionsValues.ps1 +++ b/azure-pipelines/variables/InsertVersionsValues.ps1 @@ -6,28 +6,6 @@ return $MacroName = 'LibraryNoDotsVersion' $SampleProject = "$PSScriptRoot\..\..\src\LibraryName" -try { - return [string]::join(',',(@{ - ($MacroName) = & { (dotnet tool run nbgv get-version --project $SampleProject --format json | ConvertFrom-Json).AssemblyVersion }; - }.GetEnumerator() |% { "$($_.key)=$($_.value)" })) -} -catch { - Write-Error $_ - Write-Error "Failed. Diagnostic data proceeds:" - [string]::join(',',(@{ - ($MacroName) = & { - Write-Host "dotnet tool run nbgv get-version --project `"$SampleProject`" --format json" - $result1 = dotnet tool run nbgv get-version --project $SampleProject --format json - Write-Host $result1 - $result2 = dotnet tool run nbgv get-version --project $SampleProject --format json | ConvertFrom-Json - Write-Host $result2 - Write-Host $result2.AssemblyVersion - Write-Host (dotnet tool run nbgv get-version --project $SampleProject --format json | ConvertFrom-Json).AssemblyVersion - Write-Output (dotnet tool run nbgv get-version --project $SampleProject --format json | ConvertFrom-Json).AssemblyVersion - }; - }.GetEnumerator() |% { "$($_.key)=$($_.value)" })) - - Write-Host "one more..." - $r = & { (dotnet tool run nbgv get-version --project $SampleProject --format json | ConvertFrom-Json).AssemblyVersion }; - Write-Host $r -} +[string]::join(',',(@{ + ($MacroName) = & { (dotnet tool run nbgv -- get-version --project $SampleProject --format json | ConvertFrom-Json).AssemblyVersion }; +}.GetEnumerator() |% { "$($_.key)=$($_.value)" })) From 6ed5201ef0c74f14f07fa87b3ff1db64187fab2f Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Mon, 22 May 2023 08:43:08 -0600 Subject: [PATCH 15/20] Fix indentation of commented section --- azure-pipelines/prepare-insertion-stages.yml | 48 ++++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/azure-pipelines/prepare-insertion-stages.yml b/azure-pipelines/prepare-insertion-stages.yml index bb3a400c..a41be032 100644 --- a/azure-pipelines/prepare-insertion-stages.yml +++ b/azure-pipelines/prepare-insertion-stages.yml @@ -32,27 +32,27 @@ stages: - task: MicroBuildCleanup@1 displayName: โ˜Ž๏ธ Send Telemetry -# - job: push -# displayName: azure-public/vs-impl feed -# ${{ if parameters.ArchiveSymbols }}: -# dependsOn: symbol_archive -# pool: -# name: AzurePipelines-EO -# vmImage: AzurePipelinesUbuntu20.04compliant -# steps: -# - checkout: none -# - download: current -# artifact: deployables-Windows -# displayName: ๐Ÿ”ป Download deployables-Windows artifact -# - task: UseDotNet@2 -# displayName: โš™๏ธ Install .NET SDK -# inputs: -# packageType: sdk -# version: 6.x -# - task: NuGetAuthenticate@1 -# displayName: ๐Ÿ” Authenticate NuGet feeds -# inputs: -# nuGetServiceConnections: azure-public/vs-impl -# forceReinstallCredentialProvider: true -# - script: dotnet nuget push $(Pipeline.Workspace)/deployables-Windows/NuGet/*.nupkg -s https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json --api-key azdo --skip-duplicate -# displayName: ๐Ÿ“ฆ Push nuget packages + # - job: push + # displayName: azure-public/vs-impl feed + # ${{ if parameters.ArchiveSymbols }}: + # dependsOn: symbol_archive + # pool: + # name: AzurePipelines-EO + # vmImage: AzurePipelinesUbuntu20.04compliant + # steps: + # - checkout: none + # - download: current + # artifact: deployables-Windows + # displayName: ๐Ÿ”ป Download deployables-Windows artifact + # - task: UseDotNet@2 + # displayName: โš™๏ธ Install .NET SDK + # inputs: + # packageType: sdk + # version: 6.x + # - task: NuGetAuthenticate@1 + # displayName: ๐Ÿ” Authenticate NuGet feeds + # inputs: + # nuGetServiceConnections: azure-public/vs-impl + # forceReinstallCredentialProvider: true + # - script: dotnet nuget push $(Pipeline.Workspace)/deployables-Windows/NuGet/*.nupkg -s https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json --api-key azdo --skip-duplicate + # displayName: ๐Ÿ“ฆ Push nuget packages From e50278a744ac29ee6f066b9406d2933c898f3eea Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Sat, 27 May 2023 07:48:43 -0600 Subject: [PATCH 16/20] Bump Nerdbank.GitVersioning to 3.6.133 --- .config/dotnet-tools.json | 2 +- Directory.Packages.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 5ed46cc1..fa4ceb59 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -21,7 +21,7 @@ ] }, "nbgv": { - "version": "3.6.132", + "version": "3.6.133", "commands": [ "nbgv" ] diff --git a/Directory.Packages.props b/Directory.Packages.props index 061f8ed4..738a2f99 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -12,7 +12,7 @@ - + From 1579bbaf76e95e700c4aef5311fd5aefc0dd2e18 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Mon, 5 Jun 2023 07:21:57 -0600 Subject: [PATCH 17/20] Bump Microsoft.NET.Test.Sdk to 17.6.1 --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 738a2f99..386c6eec 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,7 +5,7 @@ true - + From 0ba0030cbccba29085cb85cfec8702596645a62b Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Wed, 7 Jun 2023 14:30:51 -0600 Subject: [PATCH 18/20] Enable dependabot for Azure Repos --- .azuredevops/dependabot.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .azuredevops/dependabot.yml diff --git a/.azuredevops/dependabot.yml b/.azuredevops/dependabot.yml new file mode 100644 index 00000000..4d848fb5 --- /dev/null +++ b/.azuredevops/dependabot.yml @@ -0,0 +1,9 @@ +# Please see the documentation for all configuration options: +# https://eng.ms/docs/products/dependabot/configuration/version_updates + +version: 2 +updates: +- package-ecosystem: nuget + directory: / + schedule: + interval: monthly From e22efe97b08fa4795d834d7e16310143195345d6 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Wed, 7 Jun 2023 15:52:58 -0600 Subject: [PATCH 19/20] Bump Microsoft.NET.Test.Sdk to 17.6.2 --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 386c6eec..1de33284 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,7 +5,7 @@ true - + From b077dd9451c6676f9a9a0ad9cda0bee636e49c67 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Mon, 12 Jun 2023 08:31:07 -0600 Subject: [PATCH 20/20] Bump MicroBuild to 2.0.125 --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 2fe653ee..7c07eff1 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,7 +4,7 @@ true true - 2.0.117 + 2.0.125