From 45148b20b0f5f9815e63105df6a361d40f655519 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 12:30:54 +0000 Subject: [PATCH 1/6] Bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 11c3e33a..375521ca 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -72,7 +72,7 @@ jobs: # Upload SDK package - name: upload SDK - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: nuget-packages path: ./src/MSBuild.Sdk.SqlProj/bin/Release/ @@ -83,7 +83,7 @@ jobs: # Upload TestProject package - name: upload TestProject - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: nuget-packages path: ./test/TestProject/bin/Release/ @@ -100,7 +100,7 @@ jobs: # Upload templates package - name: upload templates - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: nuget-packages path: ./src/MSBuild.Sdk.SqlProj.Templates/bin/Release/ @@ -164,7 +164,7 @@ jobs: # Upload binary log - name: upload - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: binary-log-${{ matrix.os }}-${{ matrix.dotnet }}-exact-version path: ./msbuild.binlog @@ -182,14 +182,14 @@ jobs: # Upload dacpac - name: upload if: ${{ matrix.os == 'ubuntu-22.04' && matrix.dotnet == '6.0.x' }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: dacpac-package path: ./test/TestProjectWithSDKRef/bin/Debug/netstandard2.0/ # Upload binary log - name: upload - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: binary-log-${{ matrix.os }}-${{ matrix.dotnet }}-floating-version path: ./msbuild.binlog @@ -306,7 +306,7 @@ jobs: # Upload binary log - name: upload - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: binary-log-publish path: ./msbuild.binlog From 7ae62d1cede50c4be88f64867338aadca7238238 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 12:30:58 +0000 Subject: [PATCH 2/6] Bump actions/download-artifact from 3 to 4 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 11c3e33a..90f8a4c7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -143,7 +143,7 @@ jobs: # Download artifact - name: download-artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: nuget-packages path: test/TestProjectWithSDKRef/nuget-packages @@ -215,7 +215,7 @@ jobs: steps: # Download artifacts - name: download-artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: dacpac-package path: ~/dacpac-package @@ -273,7 +273,7 @@ jobs: # Download artifact - name: download-artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: nuget-packages path: test/TestProjectWithSDKRef/nuget-packages @@ -331,7 +331,7 @@ jobs: # Download artifacts - name: download-artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 id: download-nugetpackages with: name: nuget-packages From 48dfe04c6364f621153bc3697c588e8cae806ef3 Mon Sep 17 00:00:00 2001 From: Jonathan Mezach Date: Mon, 18 Dec 2023 16:33:09 +0100 Subject: [PATCH 3/6] Attempt to fix workflow Signed-off-by: Jonathan Mezach --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 39f3b8ad..edafe8d5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -74,7 +74,7 @@ jobs: - name: upload SDK uses: actions/upload-artifact@v4 with: - name: nuget-packages + name: sdk-package path: ./src/MSBuild.Sdk.SqlProj/bin/Release/ # Package TestProject @@ -85,7 +85,7 @@ jobs: - name: upload TestProject uses: actions/upload-artifact@v4 with: - name: nuget-packages + name: test-package path: ./test/TestProject/bin/Release/ # Replace tokens @@ -102,7 +102,7 @@ jobs: - name: upload templates uses: actions/upload-artifact@v4 with: - name: nuget-packages + name: template-package path: ./src/MSBuild.Sdk.SqlProj.Templates/bin/Release/ # Run tests in parallel @@ -145,7 +145,7 @@ jobs: - name: download-artifact uses: actions/download-artifact@v4 with: - name: nuget-packages + name: sdk-packages path: test/TestProjectWithSDKRef/nuget-packages # Restore packages @@ -275,7 +275,7 @@ jobs: - name: download-artifact uses: actions/download-artifact@v4 with: - name: nuget-packages + name: test-package path: test/TestProjectWithSDKRef/nuget-packages # Setup .NET SDK @@ -334,7 +334,7 @@ jobs: uses: actions/download-artifact@v4 id: download-nugetpackages with: - name: nuget-packages + name: test-package path: ~/nuget-packages - name: Display structure of downloaded files From de1ae027a5ee9ecf9d22cd6bf2f1b4720c2a26ca Mon Sep 17 00:00:00 2001 From: Jonathan Mezach Date: Mon, 18 Dec 2023 16:36:13 +0100 Subject: [PATCH 4/6] Fix typo Signed-off-by: Jonathan Mezach --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index edafe8d5..31a8d6d0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -145,7 +145,7 @@ jobs: - name: download-artifact uses: actions/download-artifact@v4 with: - name: sdk-packages + name: sdk-package path: test/TestProjectWithSDKRef/nuget-packages # Restore packages From 836ce0001cc7006eee26b8031f24484b262e445b Mon Sep 17 00:00:00 2001 From: Jonathan Mezach Date: Mon, 18 Dec 2023 16:48:04 +0100 Subject: [PATCH 5/6] Download test package too Signed-off-by: Jonathan Mezach --- .github/workflows/main.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 31a8d6d0..3ff3d768 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -148,6 +148,13 @@ jobs: name: sdk-package path: test/TestProjectWithSDKRef/nuget-packages + # Download artifact + - name: download-artifact + uses: actions/download-artifact@v4 + with: + name: test-package + path: test/TestProjectWithSDKRef/nuget-packages + # Restore packages - name: dotnet restore run: dotnet restore ./test/TestProjectWithSDKRef/TestProjectWithSDKRef.csproj --verbosity n From 689c7283a65aafd56ae0f532db10ff00b2ca6116 Mon Sep 17 00:00:00 2001 From: Jonathan Mezach Date: Mon, 18 Dec 2023 16:55:21 +0100 Subject: [PATCH 6/6] Fix publish job Signed-off-by: Jonathan Mezach --- .github/workflows/main.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3ff3d768..9ef9bc37 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -278,7 +278,14 @@ jobs: with: fetch-depth: 0 # avoid shallow clone so nbgv can do its work. - # Download artifact + # Download SDK + - name: download-artifact + uses: actions/download-artifact@v4 + with: + name: sdk-package + path: test/TestProjectWithSDKRef/nuget-packages + + # Download test package - name: download-artifact uses: actions/download-artifact@v4 with: