Added support for .NET 6 RC2

daviddesmet · Oct 13, 2021 · 7293b72 · 7293b72
1 parent 727b6f0
commit 7293b72
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 5 deletions.
diff --git a/dotnet-tools.json → .config/dotnet-tools.json b/dotnet-tools.json → .config/dotnet-tools.json
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,34 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug report
+assignees: ''
+
+---
+
+**Which version of Duende IdentityServer are you using?**
+
+**Which version of .NET are you using?**
+
+**Describe the bug**
+
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+
+Steps to reproduce the behavior.
+
+**Expected behavior**
+
+A clear and concise description of what you expected to happen.
+
+**Log output/exception with stacktrace**
+
+```
+data
+```
+
+**Additional context**
+
+Add any other context about the problem here.
diff --git a/.github/workflows/dotnet-core.yml → .github/workflows/ci.yml b/.github/workflows/dotnet-core.yml → .github/workflows/ci.yml
@@ -40,6 +40,11 @@ jobs:
       run: git fetch --tags
     - name: 'Install .NET SDK'
       uses: actions/setup-dotnet@v1
+      if: ${{ false }}
+    - name: 'Install .NET 6 RC2 SDK'
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.100-rc.2.21505.57'
     - name: '.NET Restore'
       run: dotnet tool restore
     - name: 'Build Project'

diff --git a/AspNetCore.IdentityServer.Mongo.sln b/AspNetCore.IdentityServer.Mongo.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30114.105
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31808.319
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5CC92EF3-A0E0-4215-8D5F-06BE563E2C1A}"
 EndProject
@@ -10,6 +10,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{17177BA4-A7AA-432A-B0D6-468EAD2EA7CC}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		global.json = global.json
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{FB8B21E7-2C8D-439E-AB76-F9A5C196EDB1}"

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
-		<FrameworkVersion>6.0.0-rc.1.*</FrameworkVersion>
+		<FrameworkVersion>6.0.0-rc.2.*</FrameworkVersion>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net5.0'">

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.100",
+    "version": "6.0.0-rc.2",
     "rollForward": "latestFeature"
   }
 }
diff --git a/src/AspNetCore.IdentityServer.Mongo/AspNetCore.IdentityServer.Mongo.csproj b/src/AspNetCore.IdentityServer.Mongo/AspNetCore.IdentityServer.Mongo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Nullable>enable</Nullable>
     <RootNamespace>AspNetCore.IdentityServer.Mongo</RootNamespace>