diff --git a/Application/EdFi.Ods.AdminApi.AdminConsole/EdFi.Ods.AdminApi.AdminConsole.csproj b/Application/EdFi.Ods.AdminApi.AdminConsole/EdFi.Ods.AdminApi.AdminConsole.csproj
index b70a5ada..15bc29f7 100644
--- a/Application/EdFi.Ods.AdminApi.AdminConsole/EdFi.Ods.AdminApi.AdminConsole.csproj
+++ b/Application/EdFi.Ods.AdminApi.AdminConsole/EdFi.Ods.AdminApi.AdminConsole.csproj
@@ -6,6 +6,14 @@
enable
+
+ False
+
+
+
+ False
+
+
@@ -30,11 +38,11 @@
-
+
-
-
+
+
diff --git a/Application/EdFi.Ods.AdminApi.Common/EdFi.Ods.AdminApi.Common.csproj b/Application/EdFi.Ods.AdminApi.Common/EdFi.Ods.AdminApi.Common.csproj
index f0a6c082..3266c447 100644
--- a/Application/EdFi.Ods.AdminApi.Common/EdFi.Ods.AdminApi.Common.csproj
+++ b/Application/EdFi.Ods.AdminApi.Common/EdFi.Ods.AdminApi.Common.csproj
@@ -6,6 +6,14 @@
enable
+
+ True
+
+
+
+ True
+
+
@@ -20,9 +28,9 @@
-
-
-
+
+
+
diff --git a/Application/EdFi.Ods.AdminApi.Common/Infrastructure/Helpers/CorsSettings.cs b/Application/EdFi.Ods.AdminApi.Common/Infrastructure/Helpers/CorsSettings.cs
index e4321b91..22703a28 100644
--- a/Application/EdFi.Ods.AdminApi.Common/Infrastructure/Helpers/CorsSettings.cs
+++ b/Application/EdFi.Ods.AdminApi.Common/Infrastructure/Helpers/CorsSettings.cs
@@ -34,6 +34,6 @@ namespace EdFi.Ods.AdminApi.Common.Helpers;
public class CorsSettings
{
public bool EnableCors { get; set; }
- public string[] AllowedOrigins { get; set; }
+ public string[]? AllowedOrigins { get; set; }
}
>>>>>>>> a7de2d9b (Fix CORS settings):Application/EdFi.Ods.AdminApi.Common/Infrastructure/Helpers/CorsSettings.cs
diff --git a/Application/EdFi.Ods.AdminApi.Common/Infrastructure/Helpers/StringToJsonDocumentConverter.cs b/Application/EdFi.Ods.AdminApi.Common/Infrastructure/Helpers/StringToJsonDocumentConverter.cs
index 87a378ed..6888ee50 100644
--- a/Application/EdFi.Ods.AdminApi.Common/Infrastructure/Helpers/StringToJsonDocumentConverter.cs
+++ b/Application/EdFi.Ods.AdminApi.Common/Infrastructure/Helpers/StringToJsonDocumentConverter.cs
@@ -15,14 +15,14 @@ namespace EdFi.Ods.AdminApi.Common.Helpers
{
public class StringToJsonDocumentConverter : JsonConverter
{
- public override string Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
- {
- return reader.GetString();
- }
+#pragma warning disable CS8603 // Possible null reference return.
+ public override string Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) => reader.GetString();
+#pragma warning restore CS8603 // Possible null reference return.
public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOptions options)
{
- JsonDocument jsonDocument = JsonDocument.Parse(value); jsonDocument.WriteTo(writer);
+ JsonDocument jsonDocument = JsonDocument.Parse(value);
+ jsonDocument.WriteTo(writer);
}
}
}
diff --git a/Application/EdFi.Ods.AdminApi.DBTests/EdFi.Ods.AdminApi.DBTests.csproj b/Application/EdFi.Ods.AdminApi.DBTests/EdFi.Ods.AdminApi.DBTests.csproj
index 28890c03..dfc7d66c 100644
--- a/Application/EdFi.Ods.AdminApi.DBTests/EdFi.Ods.AdminApi.DBTests.csproj
+++ b/Application/EdFi.Ods.AdminApi.DBTests/EdFi.Ods.AdminApi.DBTests.csproj
@@ -12,7 +12,7 @@
-
+
@@ -22,7 +22,9 @@
-
+
+
+
diff --git a/Application/EdFi.Ods.AdminApi.UnitTests/EdFi.Ods.AdminApi.UnitTests.csproj b/Application/EdFi.Ods.AdminApi.UnitTests/EdFi.Ods.AdminApi.UnitTests.csproj
index 54ed4ec3..26171395 100644
--- a/Application/EdFi.Ods.AdminApi.UnitTests/EdFi.Ods.AdminApi.UnitTests.csproj
+++ b/Application/EdFi.Ods.AdminApi.UnitTests/EdFi.Ods.AdminApi.UnitTests.csproj
@@ -8,7 +8,7 @@
-
+
@@ -16,6 +16,8 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
diff --git a/Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj b/Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj
index 149f518d..b3c23572 100644
--- a/Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj
+++ b/Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj
@@ -37,15 +37,15 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
-
+
+
diff --git a/Application/EdFi.Ods.AdminConsole.DBTests/EdFi.Ods.AdminConsole.DBTests.csproj b/Application/EdFi.Ods.AdminConsole.DBTests/EdFi.Ods.AdminConsole.DBTests.csproj
index 35af7660..e40000d2 100644
--- a/Application/EdFi.Ods.AdminConsole.DBTests/EdFi.Ods.AdminConsole.DBTests.csproj
+++ b/Application/EdFi.Ods.AdminConsole.DBTests/EdFi.Ods.AdminConsole.DBTests.csproj
@@ -10,7 +10,7 @@
-
+
@@ -20,7 +20,9 @@
-
+
+
+