Merge branch 'main' into release-1.0

fiddlermikey · web-flow · commit 37a4b2bdd526 · 2024-07-24T12:57:16.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -351,4 +351,4 @@ healthchecksdb
 
 logs
 *.pem
-*.crt
+*.crt
diff --git a/GCPCAS.sln b/GCPCAS.sln
@@ -1,4 +1,3 @@
-﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
diff --git a/GCPCAS/GCPCAS.csproj b/GCPCAS/GCPCAS.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
 		<ImplicitUsings>disable</ImplicitUsings>
diff --git a/integration-manifest.json b/integration-manifest.json
@@ -41,4 +41,4 @@
             ]
         }
     }
-}
+}

-Original file line number
+Diff line change
 logs
 *.pem
 -*.crt
 +*.crt
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`Microsoft Visual Studio Solution File, Format Version 12.00`
`3`	`2`	`# Visual Studio Version 17`
`4`	`3`	`VisualStudioVersion = 17.0.31903.59`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Project Sdk="Microsoft.NET.Sdk">`
	`1`	`+<Project Sdk="Microsoft.NET.Sdk">`
`2`	`2`	`<PropertyGroup>`
`3`	`3`	`<TargetFramework>net6.0</TargetFramework>`
`4`	`4`	`<ImplicitUsings>disable</ImplicitUsings>`