Build updates.

Project file cleanup.
dbeattie71 · Oct 29, 2018 · 5593ded · 5593ded
1 parent 6d721b0
commit 5593ded
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 15 deletions.
diff --git a/Build/Targets/Import.targets b/Build/Targets/Import.targets
@@ -16,6 +16,8 @@
 
     <Import Project="Workarounds.targets" />
 
+	<Import Project="InternalPackages.targets" />
+
     <Import Project="PackageVersions.targets" />
 
 </Project>
diff --git a/Build/Targets/InternalPackages.targets b/Build/Targets/InternalPackages.targets
@@ -0,0 +1,25 @@
+<Project>
+
+	<ItemGroup>
+		<CommonPackage Include="Cosmos.Build.Common" ProjectPath="source\Cosmos.Build.Common1\Cosmos.Build.Common.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<InternalPackage Include="@(CommonPackage)" Version="$(CommonVersion)" RepoRoot="$(CommonRepoRoot)" />
+	</ItemGroup>
+
+    <ItemGroup>
+        <_InternalPackageToExclude Include="@(InternalPackage)" Exclude="@(PackageReference)" />
+        <_InternalPackage Include="@(InternalPackage)" Exclude="@(_InternalPackageToExclude)" />
+        <_InternalPackage Update="@(_InternalPackage)" ProjectPath="$([System.IO.Path]::Combine(%(RepoRoot), %(ProjectPath)))">
+            <ProjectExists Condition="Exists(%(ProjectPath))">True</ProjectExists>
+        </_InternalPackage>
+        <_InternalPackageToReplace Include="@(_InternalPackage->WithMetadataValue('ProjectExists', 'True'))" />
+        <!-- next 3 lines: hack to move metadata from _InternalPackage to PackageReference -->
+        <_InternalPackageToKeep Include="@(_InternalPackage)" Exclude="@(_InternalPackageToReplace)" />
+        <PackageReference Remove="@(_InternalPackage)" />
+        <PackageReference Include="@(_InternalPackageToKeep)" />
+        <ProjectReference Include="@(_InternalPackageToReplace->'%(ProjectPath)')" />
+    </ItemGroup>
+
+</Project>
diff --git a/Build/Targets/RestoreSources.props b/Build/Targets/RestoreSources.props
@@ -6,6 +6,7 @@
         <RestoreSources>
             https://api.nuget.org/v3/index.json;
             https://www.myget.org/F/cosmos/api/v3/index.json;
+			https://ci.appveyor.com/nuget/cosmos-common;
             https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json
         </RestoreSources>
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,10 +7,15 @@
 
     <PropertyGroup>
         <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
+		<CommonRepoRoot>$(RepoRoot)..\Common\</CommonRepoRoot>
         <IL2CPURepoRoot>$(RepoRoot)..\IL2CPU\</IL2CPURepoRoot>
         <XSharpRepoRoot>$(RepoRoot)..\XSharp\</XSharpRepoRoot>
     </PropertyGroup>
 
+	<PropertyGroup>
+		<CommonVersion>0.1.0-build5</CommonVersion>
+	</PropertyGroup>
+
     <Import Project="build\Targets\Import.props" />
 
 </Project>
diff --git a/source/Cosmos.Debug.GDB/Cosmos.Debug.GDB.csproj b/source/Cosmos.Debug.GDB/Cosmos.Debug.GDB.csproj
@@ -3,13 +3,9 @@
     <PropertyGroup>
         <TargetFramework>net471</TargetFramework>
         <OutputType>WinExe</OutputType>
+        <IncludeWindowsFormsReferences>True</IncludeWindowsFormsReferences>
     </PropertyGroup>
 
-    <ItemGroup>
-        <Reference Include="System.Data.DataSetExtensions" />
-        <Reference Include="System.Windows.Forms" />
-    </ItemGroup>
-
     <ItemGroup>
 
         <Compile Update="BreakpointUC.cs" SubType="UserControl" />
@@ -59,7 +55,11 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Cosmos.Build.Common\Cosmos.Build.Common.csproj" />
+        <Reference Include="System.Data.DataSetExtensions" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Cosmos.Build.Common" />
     </ItemGroup>
 
 </Project>
diff --git a/source/Cosmos.Debug.Hosts/Cosmos.Debug.Hosts.csproj b/source/Cosmos.Debug.Hosts/Cosmos.Debug.Hosts.csproj
@@ -5,12 +5,12 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="Cosmos.Build.Common" />
         <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
         <PackageReference Include="System.IO.Ports" Version="4.4.0" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Cosmos.Build.Common\Cosmos.Build.Common.csproj" />
         <ProjectReference Include="..\Cosmos.Debug.Common\Cosmos.Debug.Common.csproj" />
     </ItemGroup>
 

diff --git a/source/Cosmos.Deploy.USB/Cosmos.Deploy.USB.csproj b/source/Cosmos.Deploy.USB/Cosmos.Deploy.USB.csproj
@@ -15,7 +15,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Cosmos.Build.Common\Cosmos.Build.Common.csproj" />
+        <PackageReference Include="Cosmos.Build.Common" />
     </ItemGroup>
 
 </Project>
diff --git a/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj b/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj
@@ -12,7 +12,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Cosmos.Build.Common\Cosmos.Build.Common.csproj" />
         <ProjectReference Include="..\Cosmos.Debug.Common\Cosmos.Debug.Common.csproj" />
         <ProjectReference Include="..\Cosmos.Debug.DebugConnectors\Cosmos.Debug.DebugConnectors.csproj" />
         <ProjectReference Include="..\Cosmos.Debug.Hosts\Cosmos.Debug.Hosts.csproj" />
@@ -25,6 +24,7 @@
     </ItemGroup>
 
     <ItemGroup>
+        <PackageReference Include="Cosmos.Build.Common" />
         <PackageReference Include="Microsoft.Data.Sqlite" Version="2.0.0" />
         <PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.15.0" Version="15.7.27703" />
         <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="15.7.27703" />

diff --git a/source/Cosmos.VS.ProjectSystem/Cosmos.VS.ProjectSystem.csproj b/source/Cosmos.VS.ProjectSystem/Cosmos.VS.ProjectSystem.csproj
@@ -6,6 +6,8 @@
     <PropertyGroup>
         <TargetFramework>net471</TargetFramework>
         <RootNamespace>Cosmos.VS.ProjectSystem</RootNamespace>
+        <IncludeWpfReferences>True</IncludeWpfReferences>
+        <IncludeWindowsFormsReferences>True</IncludeWindowsFormsReferences>
     </PropertyGroup>
 
     <PropertyGroup>
@@ -56,14 +58,10 @@
 
     <ItemGroup>
         <Reference Include="Microsoft.VisualBasic" />
-        <Reference Include="PresentationCore" />
-        <Reference Include="PresentationFramework" />
-        <Reference Include="System.Xaml" />
-        <Reference Include="System.Windows.Forms" />
-        <Reference Include="WindowsBase" />
     </ItemGroup>
 
     <ItemGroup>
+        <PackageReference Include="Cosmos.Build.Common" />
         <PackageReference Include="Microsoft.VisualStudio.ProjectSystem.Analyzers" Version="15.3.224" />
         <PackageReference Include="Microsoft.VisualStudio.ProjectSystem.SDK" Version="15.3.224" />
         <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="15.7.27703" />
@@ -72,7 +70,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Cosmos.Build.Common\Cosmos.Build.Common.csproj" />
         <ProjectReference Include="$(XSharpRepoRoot)source\VSPropertyPages\VSPropertyPages.csproj" />
     </ItemGroup>