project restructure

.github/CODEOWNERS

@@ -1,14 +1,19 @@
 # Prism.Core
-/Source/Prism.Tests/ @brianlagunas
-/Source/Prism/ @brianlagunas
+/src/Prism.Core/ @brianlagunas @dansiegel
+/tests/Prism.Core.Tests/ @brianlagunas @dansiegel
 
 # WPF
-/Source/Wpf/ @brianlagunas
-/Sandbox/Wpf/ @brianlagunas
+/src/Wpf/ @brianlagunas
+/tests/Wpf/ @brianlagunas
+/sandbox/Wpf/ @brianlagunas
 
-# Xamarin
-/Source/Xamarin/ @dansiegel
-/Sandbox/Xamarin/ @dansiegel
+# Xamarin.Forms
+/src/Forms/ @dansiegel
+/tests/Forms/ @dansiegel
 
-# CI
-/Source/build/ @dansiegel
+# CI & Build
+global.json @dansiegel
+*.targets @dansiegel
+*.props @dansiegel
+/build/ @dansiegel
+/e2e/ @dansiegel

.gitignore

@@ -1,11 +1,6 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
-# WPF Version Info
-VersionInfo.cs
-
-!Source/Wpf/System.Windows.Interactivity.dll
-
 # User-specific files
 *.suo
 *.user

Source/Directory.Build.props → Directory.Build.props

@@ -15,30 +15,33 @@
     <ArtifactStagingRoot>$(MSBuildThisFileDirectory)Artifacts</ArtifactStagingRoot>
     <ArtifactStagingRoot Condition=" '$(BUILD_ARTIFACTSTAGINGDIRECTORY)' != '' ">$(BUILD_ARTIFACTSTAGINGDIRECTORY)</ArtifactStagingRoot>
     <PackageOutputPath>$([System.IO.Path]::Combine('$(ArtifactStagingRoot)', 'NuGet'))</PackageOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
     <IsCoreProject>$(MSBuildProjectName.Equals('Prism'))</IsCoreProject>
     <IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
-    <IsUwpProject>$(MSBuildProjectName.Contains('Windows'))</IsUwpProject>
     <IsWpfProject>$(MSBuildProjectName.Contains('Wpf'))</IsWpfProject>
     <IsFormsProject>$(MSBuildProjectName.Contains('Forms'))</IsFormsProject>
     <SignAssembly Condition=" ('$(IsCoreProject)' Or '$(IsWpfProject)') And !$(IsTestProject) ">True</SignAssembly>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)prism.snk</AssemblyOriginatorKeyFile>
     <DelaySign>False</DelaySign>
     <DisableCorePublish Condition=" '$(DisableCorePublish)' == '' ">false</DisableCorePublish>
-    <DisableUwpPublish Condition=" '$(DisableUwpPublish)' == '' ">false</DisableUwpPublish>
-    <DisableWpfPublish Condition=" '$(DisableUpfPublish)' == '' ">false</DisableWpfPublish>
+    <DisableWpfPublish Condition=" '$(DisableWpfPublish)' == '' ">false</DisableWpfPublish>
     <DisableFormsPublish Condition=" '$(DisableFormsPublish)' == '' ">false</DisableFormsPublish>
     <IsPackable>!$(IsTestProject)</IsPackable>
     <IsPackable Condition=" '$(IsCoreProject)' And !'$(IsTestProject)' ">!$(DisableCorePublish)</IsPackable>
-    <IsPackable Condition=" '$(IsUwpProject)' And !'$(IsTestProject)' ">!$(DisableUwpPublish)</IsPackable>
     <IsPackable Condition=" '$(IsWpfProject)' And !'$(IsTestProject)' ">!$(DisableWpfPublish)</IsPackable>
     <IsPackable Condition=" '$(IsFormsProject)' And !'$(IsTestProject)' ">!$(DisableFormsPublish)</IsPackable>
-    <PackageTags Condition=" '$(IsCoreProject)' == 'True' ">prism;wpf;xamarin;uwp;uap;xaml</PackageTags>
-    <PackageTags Condition=" '$(IsUwpProject)' == 'True' ">prism;mvvm;uwp;dependency injection;di</PackageTags>
+    <PackageTags Condition=" '$(IsCoreProject)' == 'True' ">prism;wpf;xamarin;xaml</PackageTags>
     <PackageTags Condition=" '$(IsWpfProject)' == 'True' ">prism;mvvm;wpf;dependency injection;di</PackageTags>
     <PackageTags Condition=" '$(IsFormsProject)' == 'True' ">prism;mvvm;uwp;android;ios;xamarin;xamarin.forms;dependency injection;di</PackageTags>
     <IS_PREVIEW Condition=" '$(IS_PREVIEW)' == '' ">false</IS_PREVIEW>
     <IS_RELEASE Condition=" '$(IS_RELEASE)' == '' ">false</IS_RELEASE>
     <UseWpf>$(IsWpfProject)</UseWpf>
+  </PropertyGroup>
+
+  <!-- Versioning -->
+  <PropertyGroup>
     <Version Condition=" '$(PRISM_RELEASE)' != '' ">$(PRISM_RELEASE)</Version>
     <!-- Update this version when incrementing Library Versions i.e. 7.1.0, 7.2.0 -->
     <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' ">8.0.0</VersionPrefix>
@@ -65,6 +68,8 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
 
-
+  <ItemGroup Condition=" $(IsTestProject) ">
+    <None Include="$(MSBuildThisFileDirectory)xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
 
 </Project>

Source/Directory.build.targets → Directory.build.targets

@@ -15,7 +15,6 @@
     <PropertyGroup>
       <BinariesFolderName Condition=" '$(IsCoreProject)' ">Core</BinariesFolderName>
       <BinariesFolderName Condition=" '$(IsFormsProject)' ">Forms</BinariesFolderName>
-      <BinariesFolderName Condition=" '$(IsUwpProject)' ">UWP</BinariesFolderName>
       <BinariesFolderName Condition=" '$(IsWpfProject)' ">WPF</BinariesFolderName>
       <ArtifactStaging>$([System.IO.Path]::Combine('$(ArtifactStagingRoot)', $(Configuration), '$(BinariesFolderName)', '$(TargetFramework)'))</ArtifactStaging>
     </PropertyGroup>