From 6a533c1a364e41309394d2253ad36b2e001ff23f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Mar 2023 17:34:43 -0600 Subject: [PATCH 1/5] Update dependencies from https://github.com/dotnet/emsdk build 20230323.1 (#83860) Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.4 -> To Version 7.0.5 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 82b1ce9063aa65..1eaea524958636 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + From c367508a67bad8bf1bb3ba11123ce0b880726f8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?= <1175054+carlossanlop@users.noreply.github.com> Date: Tue, 4 Apr 2023 18:23:30 -0600 Subject: [PATCH 2/5] [7.0] Add check-service-labels.yml to unblock base branch PRs (#84331) Co-authored-by: carlossanlop --- .github/workflows/check-service-labels.yml | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/check-service-labels.yml diff --git a/.github/workflows/check-service-labels.yml b/.github/workflows/check-service-labels.yml new file mode 100644 index 00000000000000..3d9dbc94ca3f70 --- /dev/null +++ b/.github/workflows/check-service-labels.yml @@ -0,0 +1,23 @@ +name: check-service-labels + +permissions: + pull-requests: read + +on: + pull_request: + types: [opened, edited, reopened, labeled, unlabeled, synchronize] + branches: + - 'release/**' + +jobs: + check-labels: + runs-on: ubuntu-latest + steps: + - name: Check servicing labels + run: | + if [ "${{ contains(github.event.pull_request.labels.*.name, 'Servicing-approved') }}" = "true" ]; then + exit 0 + else + exit 1 + fi + From ee07b3ec45bb185eda4c0b3be12e1e84dcdf0789 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 4 Apr 2023 17:26:07 -0700 Subject: [PATCH 3/5] Update branding to 7.0.6 (#84316) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1e80d4b67196c9..f82d5facc0a05a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 7.0.5 + 7.0.6 7 0 - 5 + 6 7.0.100 6.0.$([MSBuild]::Add($(PatchVersion), 11)) servicing From 30d3c9ccb823a97aa18ee6e1a8affb1d81a406f7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 Apr 2023 20:20:45 -0600 Subject: [PATCH 4/5] Update dependencies from https://github.com/dotnet/emsdk build 20230405.1 (#84361) Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.5 -> To Version 7.0.6 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1eaea524958636..3b47eb2e33ec79 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + From cb70e924f8ea4321b44e695fd27fc5941d67f200 Mon Sep 17 00:00:00 2001 From: carlossanlop <1175054+carlossanlop@users.noreply.github.com> Date: Thu, 6 Apr 2023 18:26:30 -0600 Subject: [PATCH 5/5] Manually resolve spacing conflict in check-service-labels.yml --- .github/workflows/check-service-labels.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/check-service-labels.yml b/.github/workflows/check-service-labels.yml index 3d9dbc94ca3f70..efbbcdf9925fd7 100644 --- a/.github/workflows/check-service-labels.yml +++ b/.github/workflows/check-service-labels.yml @@ -20,4 +20,3 @@ jobs: else exit 1 fi -