Update to .NET 7 (#206)

* Update to .NET 7 * Fix branch name * Update version * Update pool/agent version * Update .NET SDK version * Fix pool * Update compiler in codeql yaml * Fix version
Azure-Samples · Dec 21, 2022 · 0533318 · 0533318
1 parent 10c5232
commit 0533318
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 16 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -2,10 +2,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ main ]
   schedule:
     - cron: '35 11 * * 6'
 
@@ -40,11 +40,11 @@ jobs:
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
-        
+
     - name: Set up .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '6.x'
+        dotnet-version: '7.x'
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)

diff --git a/opcplc.sln b/opcplc.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 16.0.28803.156
+VisualStudioVersion = 17.4.33205.214
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{99F0F8B6-79F2-45FB-A5B7-5A3CD731A43D}"
 	ProjectSection(SolutionItems) = preProject
@@ -35,6 +35,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{
 		tools\templates\acrbuild.yml = tools\templates\acrbuild.yml
 		tools\templates\azuredeploy.opcplc.aci.json = tools\templates\azuredeploy.opcplc.aci.json
 		tools\templates\ci.yml = tools\templates\ci.yml
+		.github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "opc-plc-tests", "tests\opc-plc-tests.csproj", "{978DA9FC-4211-46CE-8548-D16E3DC3550F}"

diff --git a/src/opc-plc.csproj b/src/opc-plc.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <AssemblyName>opcplc</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>OpcPlc</PackageId>

diff --git a/tests/opc-plc-tests.csproj b/tests/opc-plc-tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>OpcPlc.Tests</RootNamespace>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/tools/scripts/docker-source.ps1 b/tools/scripts/docker-source.ps1
@@ -86,23 +86,23 @@ ENV PATH="${PATH}:/root/vsdbg/vsdbg"
     $platforms = @{
         "linux/arm/v7" = @{
             runtimeId = "linux-arm"
-            image = "mcr.microsoft.com/dotnet/runtime-deps:6.0-bullseye-slim"
+            image = "mcr.microsoft.com/dotnet/runtime-deps:7.0-bullseye-slim"
             platformTag = "linux-arm32v7"
             runtimeOnly = "RUN chmod +x $($assemblyName)"
             debugger = $installLinuxDebugger
             entryPoint = "[`"./$($assemblyName)`"]"
         }
         "linux/arm64" = @{
             runtimeId = "linux-arm64"
-            image = "mcr.microsoft.com/dotnet/runtime-deps:6.0-bullseye-slim"
+            image = "mcr.microsoft.com/dotnet/runtime-deps:7.0-bullseye-slim"
             platformTag = "linux-arm64v8"
             runtimeOnly = "RUN chmod +x $($assemblyName)"
             debugger = $null
             entryPoint = "[`"./$($assemblyName)`"]"
         }
         "linux/amd64" = @{
             runtimeId = "linux-x64"
-            image = "mcr.microsoft.com/dotnet/runtime-deps:6.0-bullseye-slim"
+            image = "mcr.microsoft.com/dotnet/runtime-deps:7.0-bullseye-slim"
             platformTag = "linux-amd64"
             runtimeOnly = "RUN chmod +x $($assemblyName)"
             debugger = $installLinuxDebugger

diff --git a/tools/scripts/get-matrix.ps1 b/tools/scripts/get-matrix.ps1
@@ -39,8 +39,8 @@ if (![string]::IsNullOrEmpty($JobPrefix)) {
 # https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software
 $agents = @{
     windows = "windows-2022"
-    linux = "ubuntu-20.04"
-    mac = "macOS-11"
+    linux = "ubuntu-22.04"
+    mac = "macOS-12"
 }
 
 $jobMatrix = @{}

diff --git a/tools/templates/acrbuild.yml b/tools/templates/acrbuild.yml
@@ -34,7 +34,7 @@ jobs:
     displayName: 'Install .NET Core SDK'
     inputs:
       packageType: sdk
-      version: 6.0.x
+      version: 7.0.x
       includePreviewVersions: false
       installationPath: $(Agent.ToolsDirectory)/dotnet
   - task: AzureCLI@1

diff --git a/tools/templates/ci.yml b/tools/templates/ci.yml
@@ -30,7 +30,7 @@ jobs:
     displayName: 'Install .NET Core SDK'
     inputs:
       packageType: sdk
-      version: 6.0.x
+      version: 7.0.x
       includePreviewVersions: false
       installationPath: $(Agent.ToolsDirectory)/dotnet
   - task: PowerShell@2
@@ -84,7 +84,7 @@ jobs:
     displayName: 'Install .NET Core SDK'
     inputs:
       packageType: sdk
-      version: 6.0.x
+      version: 7.0.x
       includePreviewVersions: false
       installationPath: $(Agent.ToolsDirectory)/dotnet
   - task: PowerShell@2

diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "2.5.8",
+  "version": "2.6.0",
   "versionHeightOffset": -1,
   "publicReleaseRefSpec": [
     "^refs/heads/main$",