diff --git a/package.props b/package.props
index ac876c9..7c03f7e 100644
--- a/package.props
+++ b/package.props
@@ -18,7 +18,7 @@
 
   <PropertyGroup>
     <SystemConfigurationConfigurationManagerVersion>4.4.*</SystemConfigurationConfigurationManagerVersion>
-    <NewtonsoftJsonVersion>11.0.*</NewtonsoftJsonVersion>
+    <NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
     <MicrosoftDataServicesClientVersion>5.8.*</MicrosoftDataServicesClientVersion>
     <MicrosoftDiagnosticsTracingTraceEventVersion>1.0.15</MicrosoftDiagnosticsTracingTraceEventVersion>
     <WindowsAzureStorageVersion>9.3.*</WindowsAzureStorageVersion>
diff --git a/source/Src/SemanticLogging.Database/SemanticLogging.Database.csproj b/source/Src/SemanticLogging.Database/SemanticLogging.Database.csproj
index 6559ea3..18dd83f 100644
--- a/source/Src/SemanticLogging.Database/SemanticLogging.Database.csproj
+++ b/source/Src/SemanticLogging.Database/SemanticLogging.Database.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\..\..\package.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net461;net47;netstandard2.0;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net461;net47;netstandard2.0;net10.0</TargetFrameworks>
 
     <AssemblyVersion>$(MajorVersion).0.0.0</AssemblyVersion>
     <FileVersion>$(Version).$(Revision)</FileVersion>
diff --git a/source/Src/SemanticLogging.EventSourceAnalyzer/SemanticLogging.EventSourceAnalyzer.csproj b/source/Src/SemanticLogging.EventSourceAnalyzer/SemanticLogging.EventSourceAnalyzer.csproj
index 0564b88..2d787b8 100644
--- a/source/Src/SemanticLogging.EventSourceAnalyzer/SemanticLogging.EventSourceAnalyzer.csproj
+++ b/source/Src/SemanticLogging.EventSourceAnalyzer/SemanticLogging.EventSourceAnalyzer.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\..\..\package.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net45;net46;net47;netstandard2.0;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net45;net46;net47;netstandard2.0</TargetFrameworks>
 
     <AssemblyVersion>$(MajorVersion).0.0.0</AssemblyVersion>
     <FileVersion>$(Version).$(Revision)</FileVersion>
diff --git a/source/Src/SemanticLogging.TextFile/SemanticLogging.TextFile.csproj b/source/Src/SemanticLogging.TextFile/SemanticLogging.TextFile.csproj
index 0296a29..1cff2ed 100644
--- a/source/Src/SemanticLogging.TextFile/SemanticLogging.TextFile.csproj
+++ b/source/Src/SemanticLogging.TextFile/SemanticLogging.TextFile.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\..\..\package.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net45;net46;net47;netstandard2.0;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net45;net46;net47;netstandard2.0;net10.0</TargetFrameworks>
 
     <AssemblyVersion>$(MajorVersion).0.0.0</AssemblyVersion>
     <FileVersion>$(Version).$(Revision)</FileVersion>
diff --git a/source/Src/SemanticLogging/SemanticLogging.csproj b/source/Src/SemanticLogging/SemanticLogging.csproj
index 47db6f5..e4a1fbe 100644
--- a/source/Src/SemanticLogging/SemanticLogging.csproj
+++ b/source/Src/SemanticLogging/SemanticLogging.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\..\..\package.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net45;net46;net47;netstandard2.0;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net45;net46;net47;netstandard2.0;net10.0</TargetFrameworks>
 
     <AssemblyVersion>$(MajorVersion).0.0.0</AssemblyVersion>
     <FileVersion>$(Version).$(Revision)</FileVersion>
diff --git a/source/Tests/SemanticLogging.Tests/SemanticLogging.Tests.csproj b/source/Tests/SemanticLogging.Tests/SemanticLogging.Tests.csproj
index 7ada291..6ce8e2b 100644
--- a/source/Tests/SemanticLogging.Tests/SemanticLogging.Tests.csproj
+++ b/source/Tests/SemanticLogging.Tests/SemanticLogging.Tests.csproj
@@ -1,48 +1,56 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\..\package.props" />
-
-  <PropertyGroup>
-    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
-    <IsPackable>false</IsPackable>
-
-    <AssemblyVersion>$(MajorVersion).0.0.0</AssemblyVersion>
-    <FileVersion>$(Version).$(Revision)</FileVersion>
-
-    <AssemblyName>EnterpriseLibrary.SemanticLogging.Tests</AssemblyName>
-    <RootNamespace>EnterpriseLibrary.SemanticLogging.Tests</RootNamespace>
-    <AssemblyTitle>Enterprise Library Semantic Logging Application Block</AssemblyTitle>
-
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\EnterpriseLibrary.snk</AssemblyOriginatorKeyFile>
-    <DelaySign>false</DelaySign>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
-    <PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.3.0-beta2" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.3.0-beta2" />
-
-    <PackageReference Include="Microsoft.Data.Services.Client" Version="$(MicrosoftDataServicesClientVersion)" />
-    <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(MicrosoftDiagnosticsTracingTraceEventVersion)" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.6.1" />
-    <PackageReference Include="WindowsAzure.Storage" Version="$(WindowsAzureStorageVersion)" />
-  </ItemGroup>
+	<Import Project="..\..\..\package.props" />
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\Src\SemanticLogging\SemanticLogging.csproj" />
-    <ProjectReference Include="..\..\Src\SemanticLogging.TextFile\SemanticLogging.TextFile.csproj" />
-    <ProjectReference Include="..\..\Src\SemanticLogging.EventSourceAnalyzer\SemanticLogging.EventSourceAnalyzer.csproj" />
-    <ProjectReference Include="..\..\Src\SemanticLogging.WindowsAzure\SemanticLogging.WindowsAzure.csproj" />
-    <ProjectReference Include="..\..\Src\SemanticLogging.Database\SemanticLogging.Database.csproj" />
-  </ItemGroup>
+	<PropertyGroup>
+		<TargetFrameworks>net47</TargetFrameworks>
+		<IsPackable>false</IsPackable>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netcoreapp2.0'">
+		<AssemblyVersion>$(MajorVersion).0.0.0</AssemblyVersion>
+		<FileVersion>$(Version).$(Revision)</FileVersion>
 
-  </ItemGroup>
+		<AssemblyName>EnterpriseLibrary.SemanticLogging.Tests</AssemblyName>
+		<RootNamespace>EnterpriseLibrary.SemanticLogging.Tests</RootNamespace>
+		<AssemblyTitle>Enterprise Library Semantic Logging Application Block</AssemblyTitle>
+
+		<SignAssembly>true</SignAssembly>
+		<AssemblyOriginatorKeyFile>..\..\EnterpriseLibrary.snk</AssemblyOriginatorKeyFile>
+		<DelaySign>false</DelaySign>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
+		<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
+		<PackageReference Include="MSTest.TestAdapter" Version="1.3.0-beta2" />
+		<PackageReference Include="MSTest.TestFramework" Version="1.3.0-beta2" />
+
+		<PackageReference Include="Microsoft.Data.Services.Client" Version="$(MicrosoftDataServicesClientVersion)" />
+		<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(MicrosoftDiagnosticsTracingTraceEventVersion)" />
+		<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
+
+		<PackageReference Include="WindowsAzure.Storage" Version="$(WindowsAzureStorageVersion)" />
+	</ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0' AND '$(TargetFramework)' != 'netcoreapp2.0'">
+	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+		<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
+	</ItemGroup>
+	<ItemGroup Condition="$(TargetFramework.StartsWith('netstandard')) OR $(TargetFramework.StartsWith('netcoreapp')) OR $(TargetFramework.StartsWith('net4'))">
+
+		<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\Src\SemanticLogging\SemanticLogging.csproj" />
+		<ProjectReference Include="..\..\Src\SemanticLogging.TextFile\SemanticLogging.TextFile.csproj" />
+		<ProjectReference Include="..\..\Src\SemanticLogging.EventSourceAnalyzer\SemanticLogging.EventSourceAnalyzer.csproj" />
+		<ProjectReference Include="..\..\Src\SemanticLogging.WindowsAzure\SemanticLogging.WindowsAzure.csproj" />
+		<ProjectReference Include="..\..\Src\SemanticLogging.Database\SemanticLogging.Database.csproj" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netcoreapp2.0'">
+
+	</ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0' AND '$(TargetFramework)' != 'netcoreapp2.0' AND '$(TargetFramework)' != 'net10.0'">
     <Reference Include="System.Configuration" />
     <Reference Include="System.Configuration.Install" />
     <Reference Include="System.Data.Services.Client" />
@@ -51,174 +59,174 @@
     <Reference Include="System.Transactions" />
     <Reference Include="System.Web.Extensions" />
 
-    <ProjectReference Include="..\..\Src\SemanticLogging.Etw\SemanticLogging.Etw.csproj" />
-  </ItemGroup>
+		<ProjectReference Include="..\..\Src\SemanticLogging.Etw\SemanticLogging.Etw.csproj" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\..\GlobalAssemblyInfo.cs">
-      <Link>GlobalAssemblyInfo.cs</Link>
-    </Compile>
-
-    <None Include="..\..\SemanticLogging.licenseheader">
-      <Link>SemanticLogging.licenseheader</Link>
-    </None>
-
-    <Compile Update="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-
-    <Compile Update="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-
-    <Content Include="Etw\Configuration\WithDiff0.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    
-    <Content Include="Etw\Configuration\WithDiff2.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    
-    <Content Include="Etw\Configuration\WithDiff1.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    
-    <Content Include="Etw\Configuration\WithExtensionsIncompleteParams.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    
-    <Content Include="Etw\Configuration\WithExtensionsNoSchemaValidation.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    
-    <Content Include="Etw\Configuration\WithErrorOnSinkCreation.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    
-    <Content Include="Etw\Configuration\WithEmptyNonStringValues.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    
-    <Content Include="Etw\Configuration\WithManyEventSourcesWithArgumentsAndFilters.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    
-    <Content Include="Etw\Configuration\WithWarnings.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    
-    <Content Include="Etw\Configuration\WithDuplicateNames.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    
-    <Content Include="Etw\Configuration\WithEventSourceIdOnly.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    
-    <Content Include="Etw\Configuration\WithNoEventSourceNameId.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    
-    <Content Include="Etw\Configuration\WithExtensionsSchemaValidation.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    
-    <Content Include="Etw\Configuration\WithExtensions.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    
-    <Content Include="Etw\Configuration\WithBadTypes.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    
-    <Content Include="Etw\Configuration\WithEventSourceNameOnly.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    
-    <Content Include="Etw\Configuration\WithManySinks.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    
-    <Content Include="Etw\Configuration\WithManyEventSources.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    
-    <Content Include="Etw\Configuration\WithDefaultValues.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-
-    <Content Include="Logging.mdf">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-
-    <Content Include="Logging_log.ldf">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <DependentUpon>Logging.mdf</DependentUpon>
-    </Content>
-    
-    <None Include="Resources\CreateGenericTable.sql" />
-    <None Include="Resources\CreateTracesType.sql" />
-    <None Include="Resources\CreateProcedureWriteTraces.sql" />
-
-    <Content Include="..\..\Src\SemanticLogging.Etw.WindowsService\SemanticLogging-svc.xsd">
-      <Link>Etw\Configuration\SemanticLogging-svc.xsd</Link>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-
-    <None Include="Resources\CreateTracesTable.sql" />
-    
-    <Content Include="Event.xsd">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    
-    <None Include="App.config">
-      <SubType>Designer</SubType>
-    </None>
-    
-    <Content Include="Etw\Configuration\MySinkElement.xsd">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
+	<ItemGroup>
+		<Compile Include="..\..\GlobalAssemblyInfo.cs">
+			<Link>GlobalAssemblyInfo.cs</Link>
+		</Compile>
 
-  </ItemGroup>
+		<None Include="..\..\SemanticLogging.licenseheader">
+			<Link>SemanticLogging.licenseheader</Link>
+		</None>
+
+		<Compile Update="Properties\Settings.Designer.cs">
+			<AutoGen>True</AutoGen>
+			<DesignTimeSharedInput>True</DesignTimeSharedInput>
+			<DependentUpon>Settings.settings</DependentUpon>
+		</Compile>
+
+		<None Include="Properties\Settings.settings">
+			<Generator>SettingsSingleFileGenerator</Generator>
+			<LastGenOutput>Settings.Designer.cs</LastGenOutput>
+		</None>
+
+		<Compile Update="Properties\Resources.Designer.cs">
+			<AutoGen>True</AutoGen>
+			<DesignTime>True</DesignTime>
+			<DependentUpon>Resources.resx</DependentUpon>
+		</Compile>
+
+		<EmbeddedResource Update="Properties\Resources.resx">
+			<Generator>ResXFileCodeGenerator</Generator>
+			<LastGenOutput>Resources.Designer.cs</LastGenOutput>
+			<SubType>Designer</SubType>
+		</EmbeddedResource>
+
+		<Content Include="Etw\Configuration\WithDiff0.xml">
+			<SubType>Designer</SubType>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+
+		<Content Include="Etw\Configuration\WithDiff2.xml">
+			<SubType>Designer</SubType>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+
+		<Content Include="Etw\Configuration\WithDiff1.xml">
+			<SubType>Designer</SubType>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+
+		<Content Include="Etw\Configuration\WithExtensionsIncompleteParams.xml">
+			<SubType>Designer</SubType>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+
+		<Content Include="Etw\Configuration\WithExtensionsNoSchemaValidation.xml">
+			<SubType>Designer</SubType>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+
+		<Content Include="Etw\Configuration\WithErrorOnSinkCreation.xml">
+			<SubType>Designer</SubType>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+
+		<Content Include="Etw\Configuration\WithEmptyNonStringValues.xml">
+			<SubType>Designer</SubType>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netcoreapp2.0'">
+		<Content Include="Etw\Configuration\WithManyEventSourcesWithArgumentsAndFilters.xml">
+			<SubType>Designer</SubType>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+
+		<Content Include="Etw\Configuration\WithWarnings.xml">
+			<SubType>Designer</SubType>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+
+		<Content Include="Etw\Configuration\WithDuplicateNames.xml">
+			<SubType>Designer</SubType>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+
+		<Content Include="Etw\Configuration\WithEventSourceIdOnly.xml">
+			<SubType>Designer</SubType>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+
+		<Content Include="Etw\Configuration\WithNoEventSourceNameId.xml">
+			<SubType>Designer</SubType>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+
+		<Content Include="Etw\Configuration\WithExtensionsSchemaValidation.xml">
+			<SubType>Designer</SubType>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+
+		<Content Include="Etw\Configuration\WithExtensions.xml">
+			<SubType>Designer</SubType>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+
+		<Content Include="Etw\Configuration\WithBadTypes.xml">
+			<SubType>Designer</SubType>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+
+		<Content Include="Etw\Configuration\WithEventSourceNameOnly.xml">
+			<SubType>Designer</SubType>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+
+		<Content Include="Etw\Configuration\WithManySinks.xml">
+			<SubType>Designer</SubType>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+
+		<Content Include="Etw\Configuration\WithManyEventSources.xml">
+			<SubType>Designer</SubType>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+
+		<Content Include="Etw\Configuration\WithDefaultValues.xml">
+			<SubType>Designer</SubType>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+
+		<Content Include="Logging.mdf">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+
+		<Content Include="Logging_log.ldf">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<DependentUpon>Logging.mdf</DependentUpon>
+		</Content>
+
+		<None Include="Resources\CreateGenericTable.sql" />
+		<None Include="Resources\CreateTracesType.sql" />
+		<None Include="Resources\CreateProcedureWriteTraces.sql" />
+
+		<Content Include="..\..\Src\SemanticLogging.Etw.WindowsService\SemanticLogging-svc.xsd">
+			<Link>Etw\Configuration\SemanticLogging-svc.xsd</Link>
+			<SubType>Designer</SubType>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+
+		<None Include="Resources\CreateTracesTable.sql" />
+
+		<Content Include="Event.xsd">
+			<SubType>Designer</SubType>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+
+		<None Include="App.config">
+			<SubType>Designer</SubType>
+		</None>
+
+		<Content Include="Etw\Configuration\MySinkElement.xsd">
+			<SubType>Designer</SubType>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+
+	</ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netcoreapp2.0' OR '$(TargetFramework)' == 'net10.0'">
     <Compile Remove="**\*.PartialTrust.cs" />
     <Compile Remove="Etw\**\*.cs" />
     <Compile Remove="TestSupport\AssemblyBuilder.cs" />
@@ -226,29 +234,29 @@
     <Compile Remove="UsingEventListener\DeferredEnablementFixture.cs" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0' AND '$(TargetFramework)' != 'netcoreapp2.0'">
-    <Compile Remove="TestSupport\NetCoreExtensions.cs" />
-  </ItemGroup>
-      
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>..\Tests.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>..\Tests.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
+	<ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0' AND '$(TargetFramework)' != 'netcoreapp2.0'">
+		<Compile Remove="TestSupport\NetCoreExtensions.cs" />
+	</ItemGroup>
+
+	<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+		<DebugSymbols>true</DebugSymbols>
+		<DebugType>full</DebugType>
+		<Optimize>false</Optimize>
+		<OutputPath>bin\Debug\</OutputPath>
+		<DefineConstants>TRACE;DEBUG</DefineConstants>
+		<ErrorReport>prompt</ErrorReport>
+		<WarningLevel>4</WarningLevel>
+		<CodeAnalysisRuleSet>..\Tests.ruleset</CodeAnalysisRuleSet>
+	</PropertyGroup>
+
+	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+		<DebugType>pdbonly</DebugType>
+		<Optimize>true</Optimize>
+		<OutputPath>bin\Release\</OutputPath>
+		<DefineConstants>TRACE</DefineConstants>
+		<ErrorReport>prompt</ErrorReport>
+		<WarningLevel>4</WarningLevel>
+		<CodeAnalysisRuleSet>..\Tests.ruleset</CodeAnalysisRuleSet>
+	</PropertyGroup>
 
 </Project>