From 9e5df162403088d55e61399a3cd80ba47a209470 Mon Sep 17 00:00:00 2001 From: Daniel Cazzulino Date: Fri, 11 Aug 2023 14:32:05 -0300 Subject: [PATCH 1/2] Update dependencies with those without the old SL --- src/App/App.csproj | 5 ++++- src/Package/Package.csproj | 9 ++++++--- src/SponsorLink/SponsorLink.csproj | 14 +++++++------- src/Tests/Tests.csproj | 3 +-- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/App/App.csproj b/src/App/App.csproj index fdd9a476..2267e5a3 100644 --- a/src/App/App.csproj +++ b/src/App/App.csproj @@ -19,7 +19,10 @@ - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/Package/Package.csproj b/src/Package/Package.csproj index cbbe90ac..86c14443 100644 --- a/src/Package/Package.csproj +++ b/src/Package/Package.csproj @@ -30,12 +30,15 @@ - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - - + + diff --git a/src/SponsorLink/SponsorLink.csproj b/src/SponsorLink/SponsorLink.csproj index 673962b9..de0752d4 100644 --- a/src/SponsorLink/SponsorLink.csproj +++ b/src/SponsorLink/SponsorLink.csproj @@ -11,19 +11,19 @@ - - + + - + - - - + + + - + diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj index 5159f9ed..5ad4939b 100644 --- a/src/Tests/Tests.csproj +++ b/src/Tests/Tests.csproj @@ -18,7 +18,7 @@ - + @@ -48,5 +48,4 @@ - \ No newline at end of file From 710991415c9af4f20bcc41230745e474ba7118b5 Mon Sep 17 00:00:00 2001 From: Daniel Cazzulino Date: Fri, 11 Aug 2023 14:57:17 -0300 Subject: [PATCH 2/2] Install .NET6 so we can use raw string literals This is what ThisAssembly uses, not directly ourselves. But it should be fine anyway. --- .github/workflows/build.yml | 5 +++++ .github/workflows/publish.yml | 5 +++++ src/Directory.props | 1 + src/Package/Package.csproj | 8 ++------ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7140a8c2..c06d6c3d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,6 +25,11 @@ jobs: - name: 🤘 checkout uses: actions/checkout@v2 + - uses: actions/setup-dotnet@v3 + with: + dotnet-version: '8.0.x' + dotnet-quality: 'preview' + - name: 🙏 build run: | dotnet build -m:1 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e9316e14..3748dfd7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -24,6 +24,11 @@ jobs: with: fetch-depth: 0 + - uses: actions/setup-dotnet@v3 + with: + dotnet-version: '8.0.x' + dotnet-quality: 'preview' + - name: 🙏 build run: dotnet build -m:1 diff --git a/src/Directory.props b/src/Directory.props index 44870cb0..d91ee6a6 100644 --- a/src/Directory.props +++ b/src/Directory.props @@ -8,6 +8,7 @@ https://api.nuget.org/v3/index.json;https://pkg.kzu.io/index.json false + Preview diff --git a/src/Package/Package.csproj b/src/Package/Package.csproj index 86c14443..d50eb301 100644 --- a/src/Package/Package.csproj +++ b/src/Package/Package.csproj @@ -13,7 +13,6 @@ true false true - 10 @@ -29,11 +28,8 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + +