From a75b73a6d4f9c1c313b0968dd36a7b3176af79df Mon Sep 17 00:00:00 2001 From: Benjamin Michaelis Date: Fri, 18 Mar 2022 13:38:02 -0700 Subject: [PATCH 1/5] Change targetframework to frameworks --- Directory.Build.props | 3 +-- .../IntelliTect.Analyzer.Integration.Tests.csproj | 2 +- .../IntelliTect.Analyzer.Tests.csproj | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 48095384..82c3b254 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,6 @@  - net6.0 true - 8.0 + 10.0 \ No newline at end of file diff --git a/IntelliTect.Analyzer/IntelliTect.Analyzer.Integration.Tests/IntelliTect.Analyzer.Integration.Tests.csproj b/IntelliTect.Analyzer/IntelliTect.Analyzer.Integration.Tests/IntelliTect.Analyzer.Integration.Tests.csproj index 693d1c4b..6fdae681 100644 --- a/IntelliTect.Analyzer/IntelliTect.Analyzer.Integration.Tests/IntelliTect.Analyzer.Integration.Tests.csproj +++ b/IntelliTect.Analyzer/IntelliTect.Analyzer.Integration.Tests/IntelliTect.Analyzer.Integration.Tests.csproj @@ -1,7 +1,7 @@ - + net5.0;net6.0 false diff --git a/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/IntelliTect.Analyzer.Tests.csproj b/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/IntelliTect.Analyzer.Tests.csproj index 957fd4fc..61fd42e9 100644 --- a/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/IntelliTect.Analyzer.Tests.csproj +++ b/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/IntelliTect.Analyzer.Tests.csproj @@ -1,6 +1,7 @@  + net5.0;net6.0 CA2007,CA1815,CA1303,CA1707,CA1305 From afcc5e2acb287bd5f40d5ac03531e54404189f5e Mon Sep 17 00:00:00 2001 From: Benjamin Michaelis Date: Fri, 18 Mar 2022 13:49:35 -0700 Subject: [PATCH 2/5] Update Dependencies --- ...elliTect.Analyzer.Integration.Tests.csproj | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/IntelliTect.Analyzer/IntelliTect.Analyzer.Integration.Tests/IntelliTect.Analyzer.Integration.Tests.csproj b/IntelliTect.Analyzer/IntelliTect.Analyzer.Integration.Tests/IntelliTect.Analyzer.Integration.Tests.csproj index 6fdae681..c1c71837 100644 --- a/IntelliTect.Analyzer/IntelliTect.Analyzer.Integration.Tests/IntelliTect.Analyzer.Integration.Tests.csproj +++ b/IntelliTect.Analyzer/IntelliTect.Analyzer.Integration.Tests/IntelliTect.Analyzer.Integration.Tests.csproj @@ -6,17 +6,20 @@ - - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive From 84ae2ce2272460a4af90d99f3bc98f7c9d0f2387 Mon Sep 17 00:00:00 2001 From: Benjamin Michaelis Date: Fri, 18 Mar 2022 13:47:47 -0700 Subject: [PATCH 3/5] Update dotnetBuild.yml --- .github/workflows/dotnetBuild.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dotnetBuild.yml b/.github/workflows/dotnetBuild.yml index 128c2fc2..74c24e5a 100644 --- a/.github/workflows/dotnetBuild.yml +++ b/.github/workflows/dotnetBuild.yml @@ -16,7 +16,9 @@ jobs: - name: Setup .NET 6.0 uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.x' + dotnet-version: | + 6.0.x + 5.0.x - name: Get Build Information run: | pwd From 86c88e00f560e7cfca31a7ef6ba6ee25e0e99c12 Mon Sep 17 00:00:00 2001 From: Benjamin Michaelis Date: Fri, 18 Mar 2022 13:57:16 -0700 Subject: [PATCH 4/5] Minor update --- .github/workflows/dotnetBuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnetBuild.yml b/.github/workflows/dotnetBuild.yml index 74c24e5a..20aa98ac 100644 --- a/.github/workflows/dotnetBuild.yml +++ b/.github/workflows/dotnetBuild.yml @@ -13,7 +13,7 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 - - name: Setup .NET 6.0 + - name: Setup dotnet SDK uses: actions/setup-dotnet@v1 with: dotnet-version: | From 2c9901c4c4b1e82c47fb772c7a6aabee02a4c4fd Mon Sep 17 00:00:00 2001 From: Benjamin Michaelis Date: Fri, 18 Mar 2022 14:06:02 -0700 Subject: [PATCH 5/5] Update more dependencies --- .../IntelliTect.Analyzer.Tests.csproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/IntelliTect.Analyzer.Tests.csproj b/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/IntelliTect.Analyzer.Tests.csproj index 61fd42e9..21c5d9b1 100644 --- a/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/IntelliTect.Analyzer.Tests.csproj +++ b/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/IntelliTect.Analyzer.Tests.csproj @@ -6,15 +6,15 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - - + + +