Merge pull request #48 from marcominerva/develop

Update to .NET 7.0
marcominerva · Nov 9, 2022 · fb3782c · fb3782c
2 parents d239d03 + 9e27c29
commit fb3782c
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 46 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  NET_VERSION: '6.x'
+  NET_VERSION: '7.x'
   PROJECT_NAME: src/SimpleAuthentication 
   PROJECT_FILE: SimpleAuthentication.csproj  
 
@@ -26,6 +26,7 @@ jobs:
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: ${{ env.NET_VERSION }}
+        dotnet-quality: 'ga'
 
     - name: Nerdbank.GitVersioning 
       uses: dotnet/[email protected]
@@ -45,6 +46,6 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
       with:
           tag_name: v${{ steps.nbgv.outputs.NuGetPackageVersion }}
-          release_name: Release v${{ steps.nbgv.outputs.NuGetPackageVersion }}
+          release_name: Release ${{ steps.nbgv.outputs.NuGetPackageVersion }}
           draft: false
           prerelease: false
diff --git a/.github/workflows/publish_abstractions.yml b/.github/workflows/publish_abstractions.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  NET_VERSION: '6.x'
+  NET_VERSION: '7.x'
   PROJECT_NAME: src/SimpleAuthentication.Abstractions 
   PROJECT_FILE: SimpleAuthentication.Abstractions.csproj  
 
@@ -26,6 +26,7 @@ jobs:
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: ${{ env.NET_VERSION }}
+        dotnet-quality: 'ga'
 
     - name: Nerdbank.GitVersioning 
       uses: dotnet/[email protected]
@@ -45,6 +46,6 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
       with:
           tag_name: abstractions_v${{ steps.nbgv.outputs.NuGetPackageVersion }}
-          release_name: Release abstractions_v${{ steps.nbgv.outputs.NuGetPackageVersion }}
+          release_name: Release Abstractions ${{ steps.nbgv.outputs.NuGetPackageVersion }}
           draft: false
           prerelease: false
diff --git a/README.md b/README.md
@@ -49,9 +49,10 @@ Authentication can be totally configured adding an _Authentication_ section in t
       },
       "Basic": {
           "SchemeName": "Basic", // Default: Basic
-          // Uncomment the following lines if you want to validate user name and password against fixed values.
-          // Otherwise, you need to register an IBasicAuthenticationValidator implementation that will be used
-          // to validate the credentials.
+          // Uncomment the following lines if you want to validate user name and password
+          // against fixed values.
+          // Otherwise, you need to register an IBasicAuthenticationValidator implementation
+          // that will be used to validate the credentials.
           //"UserName": "marco",
           //"Password": "P@$$w0rd"
       }

diff --git a/SimpleAuthentication.sln b/SimpleAuthentication.sln
@@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		src\Directory.Build.props = src\Directory.Build.props
+		src\Directory.Packages.props = src\Directory.Packages.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{8026ED4B-E145-4982-89EC-4D8D6ABF35C6}"

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -7,11 +7,4 @@
         <EmbedUntrackedSources>true</EmbedUntrackedSources>
     </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-    </ItemGroup>
-
 </Project>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -0,0 +1,8 @@
+<Project>
+
+  <ItemGroup>
+    <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.5.109" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/SimpleAuthentication.Abstractions/SimpleAuthentication.Abstractions.csproj b/src/SimpleAuthentication.Abstractions/SimpleAuthentication.Abstractions.csproj
@@ -1,46 +1,46 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
+    <PropertyGroup>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
         <RootNamespace>SimpleAuthentication</RootNamespace>
         <DocumentationFile>SimpleAuthentication.Abstractions.xml</DocumentationFile>
         <Authors>Marco Minerva</Authors>
-		<Company>Marco Minerva</Company>
-		<Product>Common types and interfaces for Simple Authentication for ASP.NET Core</Product>
-		<Title>Common types and interfaces for Simple Authentication for ASP.NET Core</Title>
-		<Description>A library that provides common types and interfaces that are used by Simple Authentication</Description>
-		<PackageId>SimpleAuthenticationTools.Abstractions</PackageId>
-		<PackageLicenseExpression>MIT</PackageLicenseExpression>
-		<PackageProjectUrl>https://github.com/marcominerva/SimpleAuthentication</PackageProjectUrl>
-		<PackageIcon>Toolbox.png</PackageIcon>
-		<PackageTags>csharp visualstudio aspnetcore webapi authentication jwt jwtbearer apikey utilities helpers</PackageTags>
-		<RepositoryType>git</RepositoryType>
-		<RepositoryUrl>https://github.com/marcominerva/SimpleAuthentication.git</RepositoryUrl>
-		<RepositoryBranch>master</RepositoryBranch>
-		<PackageReadmeFile>README.md</PackageReadmeFile>
-	</PropertyGroup>
+        <Company>Marco Minerva</Company>
+        <Product>Common types and interfaces for Simple Authentication for ASP.NET Core</Product>
+        <Title>Common types and interfaces for Simple Authentication for ASP.NET Core</Title>
+        <Description>A library that provides common types and interfaces that are used by Simple Authentication</Description>
+        <PackageId>SimpleAuthenticationTools.Abstractions</PackageId>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <PackageProjectUrl>https://github.com/marcominerva/SimpleAuthentication</PackageProjectUrl>
+        <PackageIcon>Toolbox.png</PackageIcon>
+        <PackageTags>csharp visualstudio aspnetcore webapi authentication jwt jwtbearer apikey utilities helpers</PackageTags>
+        <RepositoryType>git</RepositoryType>
+        <RepositoryUrl>https://github.com/marcominerva/SimpleAuthentication.git</RepositoryUrl>
+        <RepositoryBranch>master</RepositoryBranch>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+    </PropertyGroup>
 
     <ItemGroup>
         <None Remove="SimpleAuthentication.Abstractions.xml" />
     </ItemGroup>
 
-	<ItemGroup>
-	  <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.10" />
-	  <PackageReference Include="Nerdbank.GitVersioning" Version="3.5.119">
-	    <PrivateAssets>all</PrivateAssets>
-	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-	  </PackageReference>
-	</ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[6.0.11,7.0.0)" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
+    </ItemGroup>
 
-	<ItemGroup>
-		<None Include="..\..\Toolbox.png">
-			<Pack>True</Pack>
-			<PackagePath></PackagePath>
-		</None>
-		<None Include="..\..\README.md" Pack="true" PackagePath="\" />
-	</ItemGroup>
+    <ItemGroup>
+        <None Include="..\..\Toolbox.png">
+            <Pack>True</Pack>
+            <PackagePath></PackagePath>
+        </None>
+        <None Include="..\..\README.md" Pack="true" PackagePath="\" />
+    </ItemGroup>
 
     <ItemGroup>
         <InternalsVisibleTo Include="SimpleAuthentication" />