Dependency updates; updated tests to .NET 9.0.

MarkCiliaVincenti · Sep 21, 2024 · f91bc5f · f91bc5f
1 parent 7862baa
commit f91bc5f
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 22 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,11 @@
+<Project>
+  <PropertyGroup>
+	  <LangVersion>latest</LangVersion>
+	  <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
+	  <CheckNotRecommendedTargetFramework>false</CheckNotRecommendedTargetFramework>
+	  <CheckEolTargetFramework>false</CheckEolTargetFramework>
+  </PropertyGroup>
+  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">
+	<DefineConstants>AOT_COMPATIBLE</DefineConstants>
+  </PropertyGroup>
+</Project>
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Mark Cilia Vincenti
+Copyright (c) 2024 Mark Cilia Vincenti
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # ![TlsCertificateLoader](https://raw.githubusercontent.com/MarkCiliaVincenti/TlsCertificateLoader/master/logo32.png) TlsCertificateLoader
 [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/MarkCiliaVincenti/TlsCertificateLoader/dotnet.yml?branch=master&logo=github&style=for-the-badge)](https://actions-badge.atrox.dev/MarkCiliaVincenti/TlsCertificateLoader/goto?ref=master) [![Nuget](https://img.shields.io/nuget/v/TlsCertificateLoader?label=TlsCertificateLoader&logo=nuget&style=for-the-badge)](https://www.nuget.org/packages/TlsCertificateLoader) [![Nuget](https://img.shields.io/nuget/dt/TlsCertificateLoader?logo=nuget&style=for-the-badge)](https://www.nuget.org/packages/TlsCertificateLoader)
 
-Allows loading of TLS (HTTPS) certificates for .NET 6.0/7.0/8.0 Kestrel web applications, allowing for refreshing of certificates as well as compatibility with HTTP/3. Fully compatible with certificates obtained by [Certbot](https://certbot.eff.org/) ([see sample project without middleware](https://github.com/MarkCiliaVincenti/TlsCertificateLoader/tree/master/Samples/CertbotSample) or [see sample project using middleware](https://github.com/MarkCiliaVincenti/TlsCertificateLoader/tree/master/Samples/CertbotSampleUsingMiddleware)).
+Allows loading of TLS (HTTPS) certificates for .NET 6.0/7.0/8.0/9.0 Kestrel web applications, allowing for refreshing of certificates as well as compatibility with HTTP/3. Fully compatible with certificates obtained by [Certbot](https://certbot.eff.org/) ([see sample project without middleware](https://github.com/MarkCiliaVincenti/TlsCertificateLoader/tree/master/Samples/CertbotSample) or [see sample project using middleware](https://github.com/MarkCiliaVincenti/TlsCertificateLoader/tree/master/Samples/CertbotSampleUsingMiddleware)).
 
 ## Installation
 The recommended means is to use [NuGet](https://www.nuget.org/packages/TlsCertificateLoader), but you could also download the source code from [here](https://github.com/MarkCiliaVincenti/TlsCertificateLoader/releases).

diff --git a/Samples/CertbotSample/CertbotSample.csproj b/Samples/CertbotSample/CertbotSample.csproj
@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="TlsCertificateLoader" Version="2.2.9" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
+    <PackageReference Include="TlsCertificateLoader" Version="2.3.1" />
   </ItemGroup>
 
 </Project>
diff --git a/Samples/CertbotSampleUsingMiddleware/CertbotSampleUsingMiddleware.csproj b/Samples/CertbotSampleUsingMiddleware/CertbotSampleUsingMiddleware.csproj
@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="TlsCertificateLoader" Version="2.2.9" />
+	  <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
+	  <PackageReference Include="TlsCertificateLoader" Version="2.3.1" />
 	</ItemGroup>
 
 </Project>
diff --git a/TlsCertificateLoader.sln b/TlsCertificateLoader.sln
@@ -11,6 +11,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CertbotSample", "Samples\Ce
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CertbotSampleUsingMiddleware", "Samples\CertbotSampleUsingMiddleware\CertbotSampleUsingMiddleware.csproj", "{1FA62A7E-40AD-4888-8709-32424D92CB67}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F6804B1C-473B-4B5F-BB16-AB22067E35CA}"
+	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/TlsCertificateLoader/TlsCertificateLoader.csproj b/TlsCertificateLoader/TlsCertificateLoader.csproj
@@ -7,28 +7,31 @@
 		<PackageProjectUrl>https://github.com/MarkCiliaVincenti/TlsCertificateLoader</PackageProjectUrl>
 		<Copyright>MIT</Copyright>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
-		<Version>2.2.10</Version>
+		<Version>2.3.1</Version>
 		<PackageIcon>logo.png</PackageIcon>
-		<PackageReleaseNotes>Dropped dependency; Updated tests to .NET 8.0.</PackageReleaseNotes>
-		<Description>Allows loading of TLS (HTTPS) certificates for .NET 6.0/7.0/8.0 Kestrel web applications, allowing for refreshing of certificates as well as compatibility with HTTP/3. Includes optional middleware for using certificates obtained by Certbot.</Description>
-		<Copyright>© 2022 Mark Cilia Vincenti</Copyright>
-		<PackageTags>HTTPS,TLS,SSL,Kestrel,HTTP3,HTTP/3,certificates,security,net6,net6.0,net7,net7.0,net8,net8.0,Certbot,aspnetcore,middleware</PackageTags>
+		<PackageReleaseNotes>Dependency updates; updated tests to .NET 9.0.</PackageReleaseNotes>
+		<Description>Allows loading of TLS (HTTPS) certificates for .NET 6.0/7.0/8.0/9.0 Kestrel web applications, allowing for refreshing of certificates as well as compatibility with HTTP/3. Includes optional middleware for using certificates obtained by Certbot.</Description>
+		<Copyright>© 2024 Mark Cilia Vincenti</Copyright>
+		<PackageTags>HTTPS,TLS,SSL,Kestrel,HTTP3,HTTP/3,certificates,security,net6,net6.0,net7,net7.0,net8,net8.0,net9,net9.0,Certbot,aspnetcore,middleware</PackageTags>
 		<RepositoryType>git</RepositoryType>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<AssemblyVersion>2.2.10.0</AssemblyVersion>
-		<FileVersion>2.2.10.0</FileVersion>
+		<AssemblyVersion>2.3.1.0</AssemblyVersion>
+		<FileVersion>2.3.1.0</FileVersion>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<IsPackable>true</IsPackable>
-		<IsTrimmable>true</IsTrimmable>
-		<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
-		<PublishTrimmed>true</PublishTrimmed>
-		<TrimmerDefaultAction>link</TrimmerDefaultAction>
 		<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
 		<EnableNETAnalyzers>True</EnableNETAnalyzers>
-		<AnalysisLevel>latest</AnalysisLevel>
-		<EnablePreviewFeatures>False</EnablePreviewFeatures>
+		<AnalysisLevel>preview</AnalysisLevel>
 		<SignAssembly>True</SignAssembly>
 		<AssemblyOriginatorKeyFile>TlsCertificateLoader.snk</AssemblyOriginatorKeyFile>
+		<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+		<PublishTrimmed>true</PublishTrimmed>
+		<TrimmerDefaultAction>link</TrimmerDefaultAction>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="$(DefineConstants.Contains(AOT_COMPATIBLE))">
+		<IsAotCompatible>true</IsAotCompatible>
+		<PublishAot>true</PublishAot>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
@@ -41,8 +44,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1" PrivateAssets="All" />
-		<PackageReference Include="NetworkPorts" Version="1.1.3" />
+		<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.25" PrivateAssets="All" />
+		<PackageReference Include="NetworkPorts" Version="1.1.4" />
 	</ItemGroup>
 
 	<ItemGroup>