Skip to content

Commit

Permalink
Merge pull request #160 from shinji-san/fix-VsTestIssue4671
Browse files Browse the repository at this point in the history
Fix - vstest issue #4671

Resolves: #160
  • Loading branch information
shinji-san authored Sep 16, 2023
2 parents 482bc12 + ed58f22 commit ebc5f84
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 19 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,16 @@ jobs:
- name: Setup .NET 6
uses: actions/[email protected]
with:
dotnet-version: 6.0.413
dotnet-version: 6.0.414

- name: Setup .NET 7
uses: actions/[email protected]
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
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
6 changes: 3 additions & 3 deletions .github/workflows/dotnetall.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ jobs:
- name: Setup .NET 6
uses: actions/[email protected]
with:
dotnet-version: 6.0.413
dotnet-version: 6.0.414

- name: Setup .NET 7
uses: actions/[email protected]
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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publishing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ jobs:
- name: Setup .NET 6
uses: actions/[email protected]
with:
dotnet-version: 6.0.413
dotnet-version: 6.0.414

- name: Setup .NET 7
uses: actions/[email protected]
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
Expand Down
6 changes: 1 addition & 5 deletions tests/SecretSharingDotNetTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit ebc5f84

Please sign in to comment.