wip

meziantou · Dec 26, 2024 · da45404 · da45404
1 parent c945722
commit da45404
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/Meziantou.Framework.slnx b/Meziantou.Framework.slnx
@@ -9,7 +9,7 @@
     <Project Path="Samples/Meziantou.Framework.InlineSnapshotTesting.Samples/Meziantou.Framework.InlineSnapshotTesting.Samples.csproj" />
     <Project Path="Samples/Meziantou.Framework.Scheduling.RecurrenceRuleSample/Meziantou.Framework.Scheduling.RecurrenceRuleSample.csproj" />
     <Project Path="Samples/Meziantou.Framework.Win32.AccessTokenConsole/Meziantou.Framework.Win32.AccessTokenConsole.csproj" />
-    <Project Path="Samples/Meziantou.Framework.Win32.ChangeJournal.Sample/Meziantou.Framework.Win32.ChangeJournal.Sample.csproj" Id="5e610dbc-0acc-47b2-8f86-90672537c2fb" />
+    <Project Path="Samples/Meziantou.Framework.Win32.ChangeJournal.Sample/Meziantou.Framework.Win32.ChangeJournal.Sample.csproj" />
     <Project Path="Samples/Meziantou.Framework.Win32.CredentialManagerConsole/Meziantou.Framework.Win32.CredentialManagerConsole.csproj" />
     <Project Path="Samples/Meziantou.Framework.Win32.DialogsSamples/Meziantou.Framework.Win32.DialogsSamples.csproj" />
     <Project Path="Samples/Meziantou.Framework.Win32.RecentDocumentsConsole/Meziantou.Framework.Win32.RecentDocumentsConsole.csproj" />
@@ -38,7 +38,7 @@
     <Project Path="src/Meziantou.AspNetCore.Components/Meziantou.AspNetCore.Components.csproj" />
     <Project Path="src/Meziantou.AspNetCore.Mvc/Meziantou.AspNetCore.Mvc.csproj" />
     <Project Path="src/Meziantou.Extensions.Logging.InMemory/Meziantou.Extensions.Logging.InMemory.csproj" />
-    <Project Path="src/Meziantou.Extensions.Logging.Xunit.v3/Meziantou.Extensions.Logging.Xunit.v3.csproj" Id="8042aa97-6cec-4290-bec6-946194ec67d2" />
+    <Project Path="src/Meziantou.Extensions.Logging.Xunit.v3/Meziantou.Extensions.Logging.Xunit.v3.csproj" />
     <Project Path="src/Meziantou.Extensions.Logging.Xunit/Meziantou.Extensions.Logging.Xunit.csproj" />
     <Project Path="src/Meziantou.Framework.ByteSize/Meziantou.Framework.ByteSize.csproj" />
     <Project Path="src/Meziantou.Framework.ChromiumTracing/Meziantou.Framework.ChromiumTracing.csproj" />
@@ -55,7 +55,7 @@
     <Project Path="src/Meziantou.Framework.Html.Tool/Meziantou.Framework.Html.Tool.csproj" />
     <Project Path="src/Meziantou.Framework.Html/Meziantou.Framework.Html.csproj" />
     <Project Path="src/Meziantou.Framework.HtmlSanitizer/Meziantou.Framework.HtmlSanitizer.csproj" />
-    <Project Path="src/Meziantou.Framework.Http.Hsts/Meziantou.Framework.Http.Hsts.csproj" Id="6f7af63d-c479-436c-9591-5ecaea583f3f" />
+    <Project Path="src/Meziantou.Framework.Http.Hsts/Meziantou.Framework.Http.Hsts.csproj" />
     <Project Path="src/Meziantou.Framework.Http/Meziantou.Framework.Http.csproj" />
     <Project Path="src/Meziantou.Framework.HttpClientMock/Meziantou.Framework.HttpClientMock.csproj" />
     <Project Path="src/Meziantou.Framework.HumanReadableSerializer/Meziantou.Framework.HumanReadableSerializer.csproj" />
@@ -124,7 +124,7 @@
     <Project Path="tests/Meziantou.Framework.Html.Tests/Meziantou.Framework.Html.Tests.csproj" />
     <Project Path="tests/Meziantou.Framework.Html.Tool.Tests/Meziantou.Framework.Html.Tool.Tests.csproj" />
     <Project Path="tests/Meziantou.Framework.HtmlSanitizer.Tests/Meziantou.Framework.HtmlSanitizer.Tests.csproj" />
-    <Project Path="tests/Meziantou.Framework.Http.Hsts.Tests/Meziantou.Framework.Http.Hsts.Tests.csproj" Id="d39369d9-5b50-46e9-82c6-c3fb9c9be707" />
+    <Project Path="tests/Meziantou.Framework.Http.Hsts.Tests/Meziantou.Framework.Http.Hsts.Tests.csproj" />
     <Project Path="tests/Meziantou.Framework.Http.Tests/Meziantou.Framework.Http.Tests.csproj" />
     <Project Path="tests/Meziantou.Framework.HttpClientMock.Tests/Meziantou.Framework.HttpClientMock.Tests.csproj" />
     <Project Path="tests/Meziantou.Framework.HumanReadableSerializer.FSharp.Tests/Meziantou.Framework.HumanReadableSerializer.FSharp.Tests.fsproj" />
@@ -169,6 +169,6 @@
     <Project Path="tests/Meziantou.Framework.StronglyTypedId.GeneratorTests/Meziantou.Framework.StronglyTypedId.GeneratorTests.csproj" />
   </Folder>
   <Folder Name="/tools/" Id="02ea681e-c7d8-13c7-8484-4ac65e1b71e8">
-    <Project Path="tools/Meziantou.Framework.Http.Hsts.Generator/Meziantou.Framework.Http.Hsts.Generator.csproj" Id="5ee93510-9d10-40cc-99fc-d84b09b77034" />
+    <Project Path="tools/Meziantou.Framework.Http.Hsts.Generator/Meziantou.Framework.Http.Hsts.Generator.csproj" />
   </Folder>
 </Solution>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -8,11 +8,11 @@
     <EnablePackageValidation Condition="'$(EnablePackageValidation)' == ''">true</EnablePackageValidation>
   </PropertyGroup>
 
-  <!--<PropertyGroup>
+  <PropertyGroup>
     <GenerateSBOM Condition="'$(GenerateSBOM)' == ''">$(IsPackable)</GenerateSBOM>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Sbom.Targets" Version="3.0.0" PrivateAssets="All" />
-  </ItemGroup>-->
+  </ItemGroup>
 
 </Project>
diff --git a/src/Meziantou.Framework.Http.Hsts/HstsDomainPolicyCollection.g.cs b/src/Meziantou.Framework.Http.Hsts/HstsDomainPolicyCollection.g.cs
@@ -1,7 +1,6 @@
 // <auto-generated />
 // Data source: https://raw.githubusercontent.com/chromium/chromium/ba720cd91299fe45b6345be1971ee628af9bc3f5/net/http/transport_security_state_static.json 
 // Commit date: 2024-12-18T23:38:47.0000000Z
-// #nullable enable // Roslyn doesn't like it :(
 
 using System.Collections.Concurrent;
 

diff --git a/tools/Meziantou.Framework.Http.Hsts.Generator/Program.cs b/tools/Meziantou.Framework.Http.Hsts.Generator/Program.cs
@@ -14,7 +14,7 @@
 // By default, generate a subset of the data. Otherwise the IDE is not responsive because of the large file
 var fullGeneration = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("GITHUB_ACTIONS"));
 var token = Environment.GetEnvironmentVariable("GITHUB_TOKEN");
-if(token is null)
+if (token is null)
 {
     // gh auth token
     var process = Process.Start(new ProcessStartInfo
@@ -97,8 +97,7 @@
     // <auto-generated />
     // Data source: {{fileUrl}} 
     // Commit date: {{commitDate.ToString("O", CultureInfo.InvariantCulture)}}
-    // #nullable enable // Roslyn doesn't like it :(
-
+    
     using System.Collections.Concurrent;
 
     namespace Meziantou.Framework.Http;