From af36dac22fe96b92cb012bcfef3050c879ceabe7 Mon Sep 17 00:00:00 2001 From: carlossanlop Date: Thu, 4 Mar 2021 09:43:30 -0800 Subject: [PATCH 1/3] Upgrade to net6.0 to prevent dependency issues after upgrading MSBuild.Locator --- Libraries/Libraries.csproj | 2 +- Program/DocsPortingTool.csproj | 2 +- Tests/Tests.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Libraries/Libraries.csproj b/Libraries/Libraries.csproj index 2ad72f9..19e52f8 100644 --- a/Libraries/Libraries.csproj +++ b/Libraries/Libraries.csproj @@ -2,7 +2,7 @@ Library - net5.0 + net6.0 Microsoft carlossanlop enable diff --git a/Program/DocsPortingTool.csproj b/Program/DocsPortingTool.csproj index 0fef0d5..59b1cbc 100644 --- a/Program/DocsPortingTool.csproj +++ b/Program/DocsPortingTool.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net6.0 DocsPortingTool.DocsPortingTool Microsoft carlossanlop diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index fdf6811..1923c45 100644 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 Microsoft carlossanlop false From 91d09b2a8e8a5409357ded41e4a3685982db3306 Mon Sep 17 00:00:00 2001 From: carlossanlop Date: Thu, 4 Mar 2021 09:55:07 -0800 Subject: [PATCH 2/3] Add .github/workflows/dotnet.yml to the solution --- DocsPortingTool.sln | 1 + 1 file changed, 1 insertion(+) diff --git a/DocsPortingTool.sln b/DocsPortingTool.sln index bd352b1..36ab166 100644 --- a/DocsPortingTool.sln +++ b/DocsPortingTool.sln @@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ProjectSection(SolutionItems) = preProject .gitignore = .gitignore BackportInstructions.md = BackportInstructions.md + .github\workflows\dotnet.yml = .github\workflows\dotnet.yml install-as-tool.ps1 = install-as-tool.ps1 README.md = README.md EndProjectSection From 9ae7653827911a8c5c11ad40dad2f32a87e294c8 Mon Sep 17 00:00:00 2001 From: carlossanlop Date: Thu, 4 Mar 2021 09:55:18 -0800 Subject: [PATCH 3/3] Try to upgrade dotnet.yml to 6.0 --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index a73cc8b..cbe35f5 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -16,7 +16,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: 5.0.x + dotnet-version: 6.0.x - name: Restore dependencies run: dotnet restore - name: Build