Remove unsupported shared projects in core and analytics

SDK/AppCenter/Microsoft.AppCenter.Android/Microsoft.AppCenter.Android.Xamarin.csproj

@@ -15,11 +15,13 @@
       <SubType>Designer</SubType>
     </TransformFile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Microsoft.AppCenter.Shared\**.cs" />
+    <Compile Include="..\Microsoft.AppCenter.Shared.Xamarin\**.cs" />
+  </ItemGroup>
   <ItemGroup>
     <LibraryProjectZip Include="..\..\..\externals\android\appcenter-release.aar">
       <Link>Jars\appcenter-release.aar</Link>
     </LibraryProjectZip>
   </ItemGroup>
-  <Import Project="..\Microsoft.AppCenter.Shared.Xamarin\Microsoft.AppCenter.Shared.Xamarin.projitems" Label="Shared" />
-  <Import Project="..\Microsoft.AppCenter.Shared\Microsoft.AppCenter.Shared.projitems" Label="Shared" />
 </Project>

SDK/AppCenter/Microsoft.AppCenter.Android/Microsoft.AppCenter.Android.csproj

@@ -7,11 +7,13 @@
     <AndroidGenerateResourceDesigner>false</AndroidGenerateResourceDesigner>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\Microsoft.AppCenter.Shared\**.cs" />
+    <Compile Include="..\Microsoft.AppCenter.Shared.Xamarin\**.cs" />
+  </ItemGroup>
   <ItemGroup>
     <AndroidLibrary Include="..\..\..\externals\android\appcenter-release.aar">
       <Link>Jars\appcenter-release.aar</Link>
     </AndroidLibrary>
   </ItemGroup>
-  <Import Project="..\Microsoft.AppCenter.Shared.Xamarin\Microsoft.AppCenter.Shared.Xamarin.projitems" Label="Shared" />
-  <Import Project="..\Microsoft.AppCenter.Shared\Microsoft.AppCenter.Shared.projitems" Label="Shared" />
 </Project>

SDK/AppCenter/Microsoft.AppCenter.Apple/Microsoft.AppCenter.Apple.Xamarin.csproj

@@ -16,6 +16,10 @@
     <ObjcBindingApiDefinition Include="ApiDefinition.cs" />
     <ObjcBindingCoreSource Include="StructsAndEnums.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Microsoft.AppCenter.Shared\**.cs" />
+    <Compile Include="..\Microsoft.AppCenter.Shared.Xamarin\**.cs" />
+  </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.EndsWith('iOS'))">
     <Reference Include="Xamarin.iOS" />
     <NativeReference Include="..\..\..\externals\apple\ios\AppCenter.a">
@@ -34,6 +38,4 @@
       <Frameworks>CoreTelephony Security SystemConfiguration</Frameworks>
     </NativeReference>
   </ItemGroup>
-  <Import Project="..\Microsoft.AppCenter.Shared.Xamarin\Microsoft.AppCenter.Shared.Xamarin.projitems" Label="Shared" />
-  <Import Project="..\Microsoft.AppCenter.Shared\Microsoft.AppCenter.Shared.projitems" Label="Shared" />
 </Project>

SDK/AppCenter/Microsoft.AppCenter.Apple/Microsoft.AppCenter.Apple.csproj

@@ -17,6 +17,10 @@
     <ObjcBindingApiDefinition Include="ApiDefinition.cs" />
     <ObjcBindingCoreSource Include="StructsAndEnums.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Microsoft.AppCenter.Shared\**.cs" />
+    <Compile Include="..\Microsoft.AppCenter.Shared.Xamarin\**.cs" />
+  </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.EndsWith('-ios'))">
     <NativeReference Include="..\..\..\externals\apple\ios\AppCenter.a">
       <Kind>Static</Kind>
@@ -33,6 +37,4 @@
       <Frameworks>CoreTelephony Security SystemConfiguration</Frameworks>
     </NativeReference>
   </ItemGroup>
-  <Import Project="..\Microsoft.AppCenter.Shared.Xamarin\Microsoft.AppCenter.Shared.Xamarin.projitems" Label="Shared" />
-  <Import Project="..\Microsoft.AppCenter.Shared\Microsoft.AppCenter.Shared.projitems" Label="Shared" />
 </Project>

SDK/AppCenter/Microsoft.AppCenter.Shared.Xamarin/Microsoft.AppCenter.Shared.Xamarin.projitems

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>{7076E711-FE72-4EC0-8335-045EEFC1100C}</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>Microsoft.AppCenter.Shared.Xamarin</Import_RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)DependencyConfiguration.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HttpResponse.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)IHttpNetworkAdapter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HttpException.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)AppCenterService.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)IAppCenterService.cs" />
-  </ItemGroup>
-</Project>

SDK/AppCenter/Microsoft.AppCenter.Shared.Xamarin/Microsoft.AppCenter.Shared.Xamarin.shproj

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{7076E711-FE72-4EC0-8335-045EEFC1100C}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <Import Project="Microsoft.AppCenter.Shared.Xamarin.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>

SDK/AppCenter/Microsoft.AppCenter.Shared/Microsoft.AppCenter.Shared.projitems

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>c6c4937c-d5f4-4e00-8b51-8d826ad83c5e</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>Microsoft.AppCenter</Import_RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)AppCenterException.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)WrapperSdk.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)LogLevel.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)AppCenterLogShared.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Device.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)AppCenter.cs" />
-  </ItemGroup>
-</Project>

SDK/AppCenter/Microsoft.AppCenter.Shared/Microsoft.AppCenter.Shared.shproj

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>c6c4937c-d5f4-4e00-8b51-8d826ad83c5e</ProjectGuid>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <PropertyGroup />
-  <Import Project="Microsoft.AppCenter.Shared.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>

SDK/AppCenter/Microsoft.AppCenter.UWP/Microsoft.AppCenter.UWP.csproj

@@ -20,6 +20,8 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
     <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.17763.1000" />
   </ItemGroup>
-  <Import Project="..\Microsoft.AppCenter.Shared\Microsoft.AppCenter.Shared.projitems" Label="Shared" />
-  <Import Project="..\Microsoft.AppCenter.Windows.Shared\Microsoft.AppCenter.Windows.Shared.projitems" Label="Shared" />
+  <ItemGroup>
+    <Compile Include="..\Microsoft.AppCenter.Shared\**.cs" />
+    <Compile Include="..\Microsoft.AppCenter.Shared.Windows\**.cs" />
+  </ItemGroup>
 </Project>

SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Microsoft.AppCenter.Windows.Shared.projitems

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>b4e6ad1c-21a0-43a4-bd73-ed9bfc19be6f</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>Microsoft.AppCenter.Windows.Shared</Import_RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)Channel\CancellationException.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Channel\Channel.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Channel\ChannelEventArgs.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Channel\ChannelGroup.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Channel\IAppSecretHolder.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Channel\IChannel.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Channel\IChannelGroup.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Channel\IChannelGroupFactory.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Channel\IChannelUnit.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Device.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Http\HttpIngestionException.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Http\IHttpNetworkAdapter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Http\IngestionDecorator.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Http\NetworkIngestionException.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Models\ValidationException.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Storage\IStorageAdapter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Storage\StorageAdapter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Storage\StorageFullException.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Utils\UserIdEventArgs.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Utils\SessionContext.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Utils\Constants.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)IAppCenterService.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Http\HttpNetworkAdapter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Http\INetworkStateAdapter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Http\NetworkStateIngestion.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Models\StartServiceLog.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\ServiceCall.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Http\IngestionHttp.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Http\RetryableIngestion.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\IIngestion.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\IngestionException.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\IServiceCall.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Models\Device.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Models\Log.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Models\LogContainer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Models\Serialization\LogJsonConverter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Models\Serialization\LogSerializer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Models\LogWithProperties.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)AppCenter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)AppCenterLog.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)AppCenterService.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Storage\IStorage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Storage\Storage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Storage\StorageException.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Storage\StorageCorruptedException.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Utils\AbstractDeviceInformationHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Utils\CultureInfoHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Utils\Files\Directory.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Utils\Files\File.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Utils\IApplicationLifecycleHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Utils\IApplicationSettings.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Utils\IApplicationSettingsFactory.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Utils\IDeviceInformationHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Utils\PropertyValidator.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Utils\Synchronization\State.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Utils\Synchronization\StatefulMutex.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Utils\Synchronization\StatefulMutexException.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Utils\TimeHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Utils\UnhandledExceptionOccurredEventArgs.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Utils\UserIdContext.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)WrapperSdk.cs" />
-  </ItemGroup>
-</Project>

SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Microsoft.AppCenter.Windows.Shared.shproj

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>b4e6ad1c-21a0-43a4-bd73-ed9bfc19be6f</ProjectGuid>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <PropertyGroup />
-  <Import Project="Microsoft.AppCenter.Windows.Shared.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>

SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Microsoft.AppCenter.WindowsDesktop.csproj

@@ -4,8 +4,6 @@
     <TargetFrameworks>netcoreapp3.1;net462;net472;net6.0-windows10.0.17763.0</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
-  <Import Project="..\Microsoft.AppCenter.Windows.Shared\Microsoft.AppCenter.Windows.Shared.projitems" Label="Shared" />
-  <Import Project="..\Microsoft.AppCenter.Shared\Microsoft.AppCenter.Shared.projitems" Label="Shared" />
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.0" />
@@ -21,4 +19,8 @@
     <Reference Include="System.Management" />
     <Reference Include="System.Net.Http" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Microsoft.AppCenter.Shared\**.cs" />
+    <Compile Include="..\Microsoft.AppCenter.Shared.Windows\**.cs" />
+  </ItemGroup>
 </Project>

SDK/AppCenter/Microsoft.AppCenter/Microsoft.AppCenter.csproj

@@ -3,7 +3,9 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\Microsoft.AppCenter.Shared\**.cs" />
+    <Compile Include="..\Microsoft.AppCenter.Shared.Xamarin\**.cs" />
+  </ItemGroup>
   <Target Name="GetPackagingOutputs" />
-  <Import Project="..\Microsoft.AppCenter.Shared.Xamarin\Microsoft.AppCenter.Shared.Xamarin.projitems" Label="Shared" />
-  <Import Project="..\Microsoft.AppCenter.Shared\Microsoft.AppCenter.Shared.projitems" Label="Shared" />
 </Project>

SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Android/Microsoft.AppCenter.Analytics.Android.Xamarin.csproj

@@ -15,6 +15,9 @@
       <SubType>Designer</SubType>
     </TransformFile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Microsoft.AppCenter.Analytics.Shared\**.cs" />
+  </ItemGroup>
   <ItemGroup>
     <LibraryProjectZip Include="..\..\..\externals\android\appcenter-analytics-release.aar">
       <Link>Jars\appcenter-analytics-release.aar</Link>

SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Android/Microsoft.AppCenter.Analytics.Android.csproj

@@ -7,6 +7,9 @@
     <AndroidGenerateResourceDesigner>false</AndroidGenerateResourceDesigner>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\Microsoft.AppCenter.Analytics.Shared\**.cs" />
+  </ItemGroup>
   <ItemGroup>
     <AndroidLibrary Include="..\..\..\externals\android\appcenter-analytics-release.aar">
       <Link>Jars\appcenter-analytics-release.aar</Link>

SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Apple/Microsoft.AppCenter.Analytics.Apple.Xamarin.csproj

@@ -15,6 +15,9 @@
     <ObjcBindingApiDefinition Include="ApiDefinition.cs" />
     <ObjcBindingCoreSource Include="StructsAndEnums.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Microsoft.AppCenter.Analytics.Shared\**.cs" />
+  </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.EndsWith('iOS'))">
     <NativeReference Include="..\..\..\externals\apple\ios\AppCenterAnalytics.a">
       <Kind>Static</Kind>

SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Apple/Microsoft.AppCenter.Analytics.Apple.csproj

@@ -17,6 +17,9 @@
     <ObjcBindingApiDefinition Include="ApiDefinition.cs" />
     <ObjcBindingCoreSource Include="StructsAndEnums.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Microsoft.AppCenter.Analytics.Shared\**.cs" />
+  </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.EndsWith('-ios'))">
     <NativeReference Include="..\..\..\externals\apple\ios\AppCenterAnalytics.a">
       <Kind>Static</Kind>

SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Shared/NamespaceDoc.cs

@@ -6,7 +6,7 @@ namespace Microsoft.AppCenter.Analytics
     /// <summary>
     /// Analytics SDK module.
     /// </summary>
-    internal class NamespaceDoc
+    class NamespaceDoc
     {
     }
 }

SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.UWP/Microsoft.AppCenter.Analytics.UWP.csproj

@@ -13,8 +13,11 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'uap10.0.16299'">
     <TransformFile Include="Properties\Microsoft.AppCenter.Analytics.UWP.rd.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Microsoft.AppCenter.Analytics.Shared\**.cs" />
+    <Compile Include="..\Microsoft.AppCenter.Analytics.Shared.Windows\**.cs" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\AppCenter\Microsoft.AppCenter.UWP\Microsoft.AppCenter.UWP.csproj" />
   </ItemGroup>
-  <Import Project="..\Microsoft.AppCenter.Analytics.Windows.Shared\Microsoft.AppCenter.Analytics.Windows.Shared.projitems" Label="Shared" />
 </Project>

SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Windows.Shared/Microsoft.AppCenter.Analytics.Windows.Shared.projitems

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>7ce5bf9e-3650-4151-8b54-c1301aa73606</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>Microsoft.AppCenter.Analytics.Windows.Shared</Import_RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)Analytics.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Channel\SessionTracker.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Models\EventLog.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Models\PageLog.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Models\StartSessionLog.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Channel\ISessionTracker.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Channel\ISessionTrackerFactory.cs" />
-  </ItemGroup>
-</Project>

SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Windows.Shared/Microsoft.AppCenter.Analytics.Windows.Shared.shproj

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>7ce5bf9e-3650-4151-8b54-c1301aa73606</ProjectGuid>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <PropertyGroup />
-  <Import Project="Microsoft.AppCenter.Analytics.Windows.Shared.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>

SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.WindowsDesktop/Microsoft.AppCenter.Analytics.WindowsDesktop.csproj

@@ -4,8 +4,11 @@
     <TargetFrameworks>netcoreapp3.1;net462;net472;net6.0-windows10.0.17763.0</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\Microsoft.AppCenter.Analytics.Shared\**.cs" />
+    <Compile Include="..\Microsoft.AppCenter.Analytics.Shared.Windows\**.cs" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\AppCenter\Microsoft.AppCenter.WindowsDesktop\Microsoft.AppCenter.WindowsDesktop.csproj" />
   </ItemGroup>
-  <Import Project="..\Microsoft.AppCenter.Analytics.Windows.Shared\Microsoft.AppCenter.Analytics.Windows.Shared.projitems" Label="Shared" />
 </Project>

SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics/Microsoft.AppCenter.Analytics.csproj

@@ -3,6 +3,9 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\Microsoft.AppCenter.Analytics.Shared\**.cs" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\AppCenter\Microsoft.AppCenter\Microsoft.AppCenter.csproj" />
   </ItemGroup>