From d35e2e33aae99b4161049e0e7d64e53b0be88944 Mon Sep 17 00:00:00 2001
From: Sebastian Walther <github.dev@sebastian-walther.de>
Date: Sat, 16 Sep 2023 19:15:36 +0200
Subject: [PATCH 1/2] SecretSharingDotNetTest.csproj: Remove workaround for
 vstest issue #4671

Resolves: No entry
---
 tests/SecretSharingDotNetTest.csproj | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/tests/SecretSharingDotNetTest.csproj b/tests/SecretSharingDotNetTest.csproj
index 563ea62..7d4e333 100644
--- a/tests/SecretSharingDotNetTest.csproj
+++ b/tests/SecretSharingDotNetTest.csproj
@@ -3,11 +3,7 @@
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
     <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-    <!-- Remove line above and uncomment lines below to test on .NET 4.6.2 and above -->
-    <!-- Workaround for https://github.com/microsoft/vstest/issues/4549 -->
-    <!-- Workaround for https://github.com/microsoft/vstest/issues/4671 -->
-    <!-- Workaround for https://github.com/microsoft/vstest/issues/4627 -->
-    <!--    <TargetFrameworks>net462;net47;net471;net472;net48;net6.0;net7.0</TargetFrameworks>-->
+    <TargetFrameworks>net462;net47;net471;net472;net48;net6.0;net7.0</TargetFrameworks>
     <AssemblyOriginatorKeyFile>..\src\SecretSharingDotNet.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>True</SignAssembly>
     <IsPackable>false</IsPackable>

From ed58f22815d99a8159e3a9963ce58203f56144ec Mon Sep 17 00:00:00 2001
From: Sebastian Walther <github.dev@sebastian-walther.de>
Date: Sat, 16 Sep 2023 19:21:31 +0200
Subject: [PATCH 2/2] *.yml: Update .NET version to 6.0.414 and 7.0.401

The new versions fix the issue #4671:
https://github.com/microsoft/vstest/issues/4671

Resolves: No enty
---
 .github/workflows/codeql-analysis.yml |  6 +++---
 .github/workflows/dotnet.yml          | 10 +++++-----
 .github/workflows/dotnetall.yml       |  6 +++---
 .github/workflows/publishing.yml      |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 2e89db2..b9adb03 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -44,16 +44,16 @@ jobs:
     - name: Setup .NET 6
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 6.0.413
+        dotnet-version: 6.0.414
 
     - name: Setup .NET 7
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 7.0.400
+        dotnet-version: 7.0.401
 
     - name: .NET Core SxS
       run: |
-        rsync -a ${DOTNET_ROOT/7.0.400/6.0.413}/* $DOTNET_ROOT/
+        rsync -a ${DOTNET_ROOT/7.0.401/6.0.414}/* $DOTNET_ROOT/
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index dceac2e..755ac79 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -17,7 +17,7 @@ jobs:
       DOTNET_CLI_TELEMETRY_OPTOUT: true
     strategy:
       matrix:
-        dotnet: [ '6.0.413', '7.0.400' ]
+        dotnet: [ '6.0.414', '7.0.401' ]
     name: Dotnet ${{ matrix.dotnet }}
 
     steps:
@@ -27,14 +27,14 @@ jobs:
       with:
         dotnet-version: ${{ matrix.dotnet }}
     - name: Build with dotnet SDK v6.0
-      if: matrix.dotnet == '6.0.413'
+      if: matrix.dotnet == '6.0.414'
       run: dotnet build --configuration Release SecretSharingDotNet6.sln
     - name: Test with dotnet SDK v6.0
-      if: matrix.dotnet == '6.0.413'
+      if: matrix.dotnet == '6.0.414'
       run: dotnet test --configuration Release SecretSharingDotNet6.sln
     - name: Build with dotnet SDK v7.0
-      if: matrix.dotnet == '7.0.400'
+      if: matrix.dotnet == '7.0.401'
       run: dotnet build --configuration Release SecretSharingDotNet7.sln
     - name: Test with dotnet SDK v7.0
-      if: matrix.dotnet == '7.0.400'
+      if: matrix.dotnet == '7.0.401'
       run: dotnet test --configuration Release SecretSharingDotNet7.sln
diff --git a/.github/workflows/dotnetall.yml b/.github/workflows/dotnetall.yml
index 16a732b..12ed35b 100644
--- a/.github/workflows/dotnetall.yml
+++ b/.github/workflows/dotnetall.yml
@@ -21,16 +21,16 @@ jobs:
     - name: Setup .NET 6
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 6.0.413
+        dotnet-version: 6.0.414
 
     - name: Setup .NET 7
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 7.0.400
+        dotnet-version: 7.0.401
 
     - name: .NET Core SxS
       run: |
-        rsync -a ${DOTNET_ROOT/7.0.400/6.0.413}/* $DOTNET_ROOT/
+        rsync -a ${DOTNET_ROOT/7.0.401/6.0.414}/* $DOTNET_ROOT/
 
     - name: Restore
       run: dotnet restore SecretSharingDotNet.sln
diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml
index 1de7bd1..14e2fad 100644
--- a/.github/workflows/publishing.yml
+++ b/.github/workflows/publishing.yml
@@ -19,16 +19,16 @@ jobs:
     - name: Setup .NET 6
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 6.0.413
+        dotnet-version: 6.0.414
 
     - name: Setup .NET 7
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 7.0.400
+        dotnet-version: 7.0.401
 
     - name: .NET Core SxS
       run: |
-        rsync -a ${DOTNET_ROOT/7.0.400/6.0.413}/* $DOTNET_ROOT/
+        rsync -a ${DOTNET_ROOT/7.0.401/6.0.414}/* $DOTNET_ROOT/
 
     - name: Decrypt large secret
       run: ./.github/secrets/decrypt_publisher_snk.sh