Merge pull request #101 from MADE-Apps/feature/workflow-ci

jamesmcroft · web-flow · commit 39ba7c94d9d2 · 2021-11-11T11:03:18.000Z
Fixed CI for releases and updated sample projects to .NET 6.0
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,22 +1,25 @@
 name: CI
 
 on:
-  create:
-    branches: 
-      - release/**
   push:
+    tags:
+    - v*
     branches:
     - main
     paths:
     - src/**
     - samples/**
+    - tests/**
+    - build/**
     - .github/workflows/ci.yml
   pull_request:
     branches:
     - main
     paths:
     - src/**
     - samples/**
+    - tests/**
+    - build/**
     - .github/workflows/ci.yml
   workflow_dispatch:
 
@@ -40,20 +43,20 @@ jobs:
         echo "BUILD_VERSION=$version" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
       shell: pwsh
 
+    - name: Setup .NET 6.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
+
     - name: Setup NuGet
       uses: NuGet/setup-nuget@v1.0.5
 
     - name: Restore dependencies
       run: nuget restore $SOLUTION
 
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 3.1.x
-
     - name: Build
       run: dotnet build $SOLUTION --configuration $BUILD_CONFIG -p:Version=$BUILD_VERSION --no-restore
 
     - name: Publish
-      if: startsWith(github.ref, 'refs/heads/release')
+      if: startsWith(github.ref, 'refs/tags/v')
       run: nuget push **\*.nupkg -Source 'https://api.nuget.org/v3/index.json' -ApiKey ${{secrets.NUGET_API_KEY}}
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -7,37 +7,38 @@ on:
     paths:
     - docs/**
     - src/**
+    - .github/workflows/docs.yml
   pull_request:
     branches:
     - main
     paths:
     - docs/**
-    - src/**
+    - .github/workflows/docs.yml
   workflow_dispatch:
 
 jobs:
   generate-docs:
-  
+
     runs-on: windows-latest
 
     steps:
     - uses: actions/checkout@v2
-    
-    - name: Setup .NET
+
+    - name: Setup .NET 6.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.x
-        
+        dotnet-version: 6.0.x
+
     - name: Setup DocFX
       uses: crazy-max/ghaction-chocolatey@v1
       with:
         args: install docfx
-    
+
     - name: DocFX Build
       working-directory: docs
       run: docfx .\docfx.json
       continue-on-error: false
-      
+
     - name: Publish
       if: github.event_name == 'push'
       uses: peaceiris/actions-gh-pages@v3
diff --git a/samples/AndroidCoreSamples/AndroidCoreSamples.csproj b/samples/AndroidCoreSamples/AndroidCoreSamples.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/samples/MADESampleApp/MADESampleApp.csproj b/samples/MADESampleApp/MADESampleApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/samples/TelerikUwpSdkSample/TelerikUwpSdkSample.csproj b/samples/TelerikUwpSdkSample/TelerikUwpSdkSample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/samples/W3SchoolsWebTests/W3SchoolsWebTests.csproj b/samples/W3SchoolsWebTests/W3SchoolsWebTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/samples/WebTests/WebTests.csproj b/samples/WebTests/WebTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/samples/WindowsAlarmsAndClock/WindowsAlarmsAndClock.csproj b/samples/WindowsAlarmsAndClock/WindowsAlarmsAndClock.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/samples/WindowsCommunityToolkitSampleApp/WindowsCommunityToolkitSampleApp.csproj b/samples/WindowsCommunityToolkitSampleApp/WindowsCommunityToolkitSampleApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/samples/XamlControlsGallery/XamlControlsGallery.csproj b/samples/XamlControlsGallery/XamlControlsGallery.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
