Merge pull request #61 from ucdavis/srk/net6-upgrade

upgrade AD419 to net6
ucdavis · Apr 28, 2022 · e09271e · e09271e
2 parents 78240af + 5b3bc69
commit e09271e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,7 +10,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/src/AD419/bin/Debug/netcoreapp3.1/AD419.dll",
+            "program": "${workspaceFolder}/src/AD419/bin/Debug/net6.0/AD419.dll",
             "args": [],
             "cwd": "${workspaceFolder}/src/AD419",
             "stopAtEntry": false,

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -15,6 +15,16 @@ variables:
   buildConfiguration: 'Release'
 
 steps:
+
+- task: UseDotNet@2
+  inputs:
+    packageType: 'sdk'
+    version: '6.x'
+
+- task: NodeTool@0
+  inputs:
+    versionSpec: '14.x'
+
 - task: NuGetToolInstaller@1
 
 - task: NuGetCommand@2

diff --git a/src/AD419/AD419.csproj b/src/AD419/AD419.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
     <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
     <IsPackable>false</IsPackable>
@@ -10,10 +10,10 @@
     <UserSecretsId>e0f634ab-2b3a-4b0f-8287-8765a71f6cc2</UserSecretsId>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Dapper" Version="2.0.35" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.4" />
-    <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.4" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="1.1.3" />
+    <PackageReference Include="Dapper" Version="2.0.123" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.3" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="4.1.0" />
   </ItemGroup>
   <ItemGroup>
     <!-- Don't publish the SPA source files, but do show them in the project files list -->