(many) Upgrade to .NET 7

perlang-org · Oct 4, 2022 · abcfc05 · abcfc05
1 parent 0e68da3
commit abcfc05
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/publish-release-packages.yml b/.github/workflows/publish-release-packages.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 7.0.100-rc.1.22431.12
 
       - name: Re-generate auto-generated files
         run: make auto-generated
@@ -50,11 +50,11 @@ jobs:
       # Create .tar.gz archives
       #
       - name: Create ${{ matrix.arch }} .tar.gz file
-        run: version=$(${GITHUB_WORKSPACE}/src/Perlang.ConsoleApp/bin/Debug/net6.0/perlang -v) && tar cvzf ../perlang-$version-${{ matrix.arch }}.tar.gz *
-        working-directory: src/Perlang.ConsoleApp/bin/Release/net6.0/${{ matrix.arch }}/publish
+        run: version=$(${GITHUB_WORKSPACE}/src/Perlang.ConsoleApp/bin/Debug/net7.0/perlang -v) && tar cvzf ../perlang-$version-${{ matrix.arch }}.tar.gz *
+        working-directory: src/Perlang.ConsoleApp/bin/Release/net7.0/${{ matrix.arch }}/publish
 
       - name: List .tar.gz files
-        run: ls -l src/Perlang.ConsoleApp/bin/Release/net6.0/*/*.tar.gz
+        run: ls -l src/Perlang.ConsoleApp/bin/Release/net7.0/*/*.tar.gz
 
       #
       # Upload archive to GitHub artifacts
@@ -63,7 +63,7 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: ${{ matrix.arch }}-release
-          path: src/Perlang.ConsoleApp/bin/Release/net6.0/${{ matrix.arch }}/*.tar.gz
+          path: src/Perlang.ConsoleApp/bin/Release/net7.0/${{ matrix.arch }}/*.tar.gz
 
   create-release:
     needs: publish-release-packages

diff --git a/.github/workflows/publish-snapshot-packages.yml b/.github/workflows/publish-snapshot-packages.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 7.0.100-rc.1.22431.12
 
       - name: Re-generate auto-generated files
         run: make auto-generated
@@ -57,11 +57,11 @@ jobs:
       # Create .tar.gz archives
       #
       - name: Create ${{ matrix.arch }} .tar.gz file
-        run: version=$(${GITHUB_WORKSPACE}/src/Perlang.ConsoleApp/bin/Debug/net6.0/perlang -v) && tar cvzf ../perlang-$version-${{ matrix.arch }}.tar.gz *
-        working-directory: src/Perlang.ConsoleApp/bin/Release/net6.0/${{ matrix.arch }}/publish
+        run: version=$(${GITHUB_WORKSPACE}/src/Perlang.ConsoleApp/bin/Debug/net7.0/perlang -v) && tar cvzf ../perlang-$version-${{ matrix.arch }}.tar.gz *
+        working-directory: src/Perlang.ConsoleApp/bin/Release/net7.0/${{ matrix.arch }}/publish
 
       - name: List .tar.gz files
-        run: ls -l src/Perlang.ConsoleApp/bin/Release/net6.0/*/*.tar.gz
+        run: ls -l src/Perlang.ConsoleApp/bin/Release/net7.0/*/*.tar.gz
 
       #
       # Upload files to releases server via rsync
@@ -71,7 +71,7 @@ jobs:
         env:
           SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
           ARGS: "-rltgoDzvO"
-          SOURCE: "./src/Perlang.ConsoleApp/bin/Release/net6.0/${{ matrix.arch }}/*.tar.gz"
+          SOURCE: "./src/Perlang.ConsoleApp/bin/Release/net7.0/${{ matrix.arch }}/*.tar.gz"
           REMOTE_HOST: ${{ secrets.SSH_REMOTE_HOST }}
           REMOTE_USER: ${{ secrets.SSH_REMOTE_USER }}
           TARGET: ${{ secrets.SSH_REMOTE_TARGET }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 7.0.100-rc.1.22431.12
 
       - name: Re-generate auto-generated files
         run: make auto-generated

diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 7.0.100-rc.1.22431.12
 
         #
         # Technically, this part is very different from the later part which

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
     <!-- C# analyzers configuration -->
     <PropertyGroup>
         <CodeAnalysisRuleSet>$(SolutionDir)global.ruleset</CodeAnalysisRuleSet>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
     </PropertyGroup>
 

diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@
 	docs-validate-api-docs install install-latest-snapshot publish-release \
 	release run test src/Perlang.Common/CommonConstants.Generated.cs
 
-RELEASE_PERLANG=src/Perlang.ConsoleApp/bin/Release/net6.0/linux-x64/publish/perlang
+RELEASE_PERLANG=src/Perlang.ConsoleApp/bin/Release/net7.0/linux-x64/publish/perlang
 
 # Enable fail-fast in case of errors
 SHELL=/bin/bash -e -o pipefail
@@ -72,7 +72,7 @@ run: auto-generated
 	# Cannot use 'dotnet run' at the moment, since it's impossible to pass
 	# /p:SolutionDir=$(pwd)/ to it.
 	dotnet build
-	src/Perlang.ConsoleApp/bin/Debug/net6.0/perlang
+	src/Perlang.ConsoleApp/bin/Debug/net7.0/perlang
 
 test:
 	dotnet test --configuration Release

diff --git a/scripts/local_install_linux.sh b/scripts/local_install_linux.sh
@@ -10,4 +10,4 @@ set -e
 mkdir -p $HOME/.perlang/nightly/bin
 
 dotnet publish src/Perlang.ConsoleApp/Perlang.ConsoleApp.csproj -c Release -r linux-x64 --self-contained true /p:PublishReadyToRun=true /p:SolutionDir=$(pwd)/
-cp -r src/Perlang.ConsoleApp/bin/Release/net6.0/linux-x64/publish/* $HOME/.perlang/nightly/bin
+cp -r src/Perlang.ConsoleApp/bin/Release/net7.0/linux-x64/publish/* $HOME/.perlang/nightly/bin