Merge branch 'main' into dependabot/nuget/FeatureFlags/FeatureFlags.F…

…unctionalTests/Selenium.WebDriver.ChromeDriver-95.0.4638.6900
samsmithnz · Nov 9, 2021 · 8948236 · 8948236
2 parents a169691 + afb42bd
commit 8948236
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 15 deletions.
diff --git a/.github/workflows/aspnetcore.yml b/.github/workflows/aspnetcore.yml
@@ -7,9 +7,10 @@ on:
   workflow_dispatch:
 
 env:
-  dotNetVersion: net5.0
+  dotNetVersion: net6.0
   dotNetConfiguration: Release
-  dotNetSDKVersion: "5.0.201"
+  dotNetSDKVersion: "6.0.x"
+  dotNetSDKIncludePrerelease: true
   runtimeTarget: win-x86
 
 jobs:
@@ -42,6 +43,7 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: ${{ env.dotNetSDKVersion }}
+        include-prerelease: ${{ env.dotNetSDKIncludePrerelease }} 
 
     #Publish web and web service projects
     - name: DotNet Publish Web Service
@@ -97,6 +99,7 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: ${{ env.dotNetSDKVersion }}
+        include-prerelease: ${{ env.dotNetSDKIncludePrerelease }} 
       # Test service
     - name: Variable Substitution appsettings file for tests
       uses: microsoft/variable-substitution@v1
@@ -128,7 +131,13 @@ jobs:
   deploy:
     runs-on: windows-latest
     needs: [build, test]        
-    steps:        
+    steps:      
+    # Install SDK for Selenium/Functional tests
+    - name: Setup Dotnet for use with actions
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: ${{ env.dotNetSDKVersion }}
+        include-prerelease: ${{ env.dotNetSDKIncludePrerelease }}   
     # Login with the secret SP details
     - name: Log into Azure
       uses: azure/login@v1
@@ -182,7 +191,7 @@ jobs:
 
     # Run functional tests on staging slots     
     - name: Functional Tests
-      if: 1 == 1
+      if: 1 == 0
       run: |
         $vsTestConsoleExe = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\Common7\\IDE\\Extensions\\TestPlatform\\vstest.console.exe"
         $targetTestDll = "functionaltests\FeatureFlags.FunctionalTests.dll"
@@ -197,6 +206,7 @@ jobs:
   SonarCloud:
     name: SonarCloud
     runs-on: windows-latest
+    if: 0 == 1
     steps:
       - name: Set up JDK 11
         uses: actions/setup-java@v1

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -25,8 +25,9 @@ jobs:
     name: Analyze
     runs-on: windows-latest
     env:
-      dotNetVersion: net5.0
-      dotNetSDKVersion: "5.0.201"
+      dotNetVersion: net6.0
+      dotNetSDKVersion: "6.0.x"
+      dotNetSDKIncludePrerelease: true
       dotNetConfiguration: Release
       runtimeTarget: win-x86
     strategy:
@@ -71,6 +72,7 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: ${{ env.dotNetSDKVersion }}
+        include-prerelease: ${{ env.dotNetSDKIncludePrerelease }} 
     - name: build projects with .NET 6
       if: ${{ matrix.language }} == 'csharp'
       run: |

diff --git a/FeatureFlags/FeatureFlags.ConsoleApp/FeatureFlags.ConsoleApp.csproj b/FeatureFlags/FeatureFlags.ConsoleApp/FeatureFlags.ConsoleApp.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Version>1.1.7.8</Version>
   </PropertyGroup>
 

diff --git a/FeatureFlags/FeatureFlags.FunctionalTests/FeatureFlags.FunctionalTests.csproj b/FeatureFlags/FeatureFlags.FunctionalTests/FeatureFlags.FunctionalTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/FeatureFlags/FeatureFlags.Models/FeatureFlags.Models.csproj b/FeatureFlags/FeatureFlags.Models/FeatureFlags.Models.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <nullable>enable</nullable>
   </PropertyGroup>
 

diff --git a/FeatureFlags/FeatureFlags.Service/FeatureFlags.Service.csproj b/FeatureFlags/FeatureFlags.Service/FeatureFlags.Service.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <nullable>enable</nullable>
     <UserSecretsId>c876e859-1651-4fd9-8307-7e9c4accaff5</UserSecretsId>
   </PropertyGroup>

diff --git a/FeatureFlags/FeatureFlags.Tests/FeatureFlags.Tests.csproj b/FeatureFlags/FeatureFlags.Tests/FeatureFlags.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <nullable>enable</nullable>
     <UserSecretsId>9ec82211-94eb-4d21-a912-d63a06207214</UserSecretsId>

diff --git a/FeatureFlags/FeatureFlags.Web/FeatureFlags.Web.csproj b/FeatureFlags/FeatureFlags.Web/FeatureFlags.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <Version>1.5</Version>
     <Deterministic>false</Deterministic>

diff --git a/FeatureFlags/FeatureFlagsDemo.Web/FeatureFlagsDemo.Web.csproj b/FeatureFlags/FeatureFlagsDemo.Web/FeatureFlagsDemo.Web.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1 +1 @@
-next-version: 1.5.0
+next-version: 1.6.0