From f2db6d6093c54e5eeb9db2d8dcbe15b2db92ad8c 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:58 -0600 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/emsdk build 20230323.2 (#83857) Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.15 -> To Version 6.0.16 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5cd1bd96d3af8e..f4f2d3523815f9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6ce3d4ae30788..30aa4e009401a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,17 +8,17 @@ https://github.com/dotnet/msquic 98129287d56a5e0348c291ce4260e630b4aa510d - + https://github.com/dotnet/emsdk - 253a56aaea0d63f84cc277cef649834f4c1798c6 + a243060cdb356f166664b5d0c3dad206299935e7 - + https://github.com/dotnet/emsdk - 253a56aaea0d63f84cc277cef649834f4c1798c6 + a243060cdb356f166664b5d0c3dad206299935e7 - + https://github.com/dotnet/emsdk - 253a56aaea0d63f84cc277cef649834f4c1798c6 + a243060cdb356f166664b5d0c3dad206299935e7 https://github.com/dotnet/wcf diff --git a/eng/Versions.props b/eng/Versions.props index 878675935c20b9..1143c6d5b4cdde 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -175,9 +175,9 @@ 11.1.0-alpha.1.21416.1 11.1.0-alpha.1.21416.1 - 6.0.15 - 6.0.15 - 6.0.15 + 6.0.16 + 6.0.16 + 6.0.16 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) 1.1.87-gba258badda From b90d85de5be1a7e704214cf7f98e882fa4c42d2d 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:24:01 -0600 Subject: [PATCH 2/4] [6.0] Add check-service-labels.yml to unblock base branch PRs (#84332) 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 22d94c3d5ee94fb2264b30ee17781fc6cdbef1e2 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 4 Apr 2023 19:54:48 -0700 Subject: [PATCH 3/4] Update branding to 6.0.17 (#84315) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1143c6d5b4cdde..6453a645c04830 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 6.0.16 + 6.0.17 6 0 - 16 + 17 6.0.400 servicing From 3e109839ddb415401a51574eb1e30455766ff57c 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:23:07 -0600 Subject: [PATCH 4/4] Update dependencies from https://github.com/dotnet/emsdk build 20230405.2 (#84360) Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.16 -> To Version 6.0.17 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index f4f2d3523815f9..4c76f3d8269f6a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 30aa4e009401a4..4b8bb8453018dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,17 +8,17 @@ https://github.com/dotnet/msquic 98129287d56a5e0348c291ce4260e630b4aa510d - + https://github.com/dotnet/emsdk - a243060cdb356f166664b5d0c3dad206299935e7 + 3c730c2c99c521adabe9b67b74bdba3a682d66d7 - + https://github.com/dotnet/emsdk - a243060cdb356f166664b5d0c3dad206299935e7 + 3c730c2c99c521adabe9b67b74bdba3a682d66d7 - + https://github.com/dotnet/emsdk - a243060cdb356f166664b5d0c3dad206299935e7 + 3c730c2c99c521adabe9b67b74bdba3a682d66d7 https://github.com/dotnet/wcf diff --git a/eng/Versions.props b/eng/Versions.props index 6453a645c04830..b086553e18dcb3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -175,9 +175,9 @@ 11.1.0-alpha.1.21416.1 11.1.0-alpha.1.21416.1 - 6.0.16 - 6.0.16 - 6.0.16 + 6.0.17 + 6.0.17 + 6.0.17 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) 1.1.87-gba258badda