More nuget work required

cimbalino · Jul 26, 2015 · 2fefdf3 · 2fefdf3
1 parent 6f93ed5
commit 2fefdf3
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 10 deletions.
diff --git a/build/default.ps1 b/build/default.ps1
@@ -136,10 +136,23 @@ task Build -depends Clean, Setup, Version -description "Build all projects and g
 
       $projectDir = "$binariesDir\$projectName"
       $configurationDir = "$projectDir\$configurationFolder"
+	  $propertiesDir = "$configurationDir\$projectName\Properties"
+      $tempPropertiesDir = "$tempBinariesDir\$fullProjectName\Properties\"
 
       New-Item -Path $configurationDir -ItemType Directory | Out-Null
+
+	  $tempPropertiesDirExists = Test-Path -PathType Container $tempPropertiesDir
+	  if($tempPropertiesDirExists -eq $true){
+
+            $propertiesDirExists = Test-Path -PathType Container $propertiesDir
+            if($propertiesDirExists -eq $false){
+                New-Item -Path $propertiesDir -ItemType Directory | Out-Null
+            }
+
+			Copy-Item -Path $tempPropertiesDir\* -Destination $propertiesDir\ -Recurse -force
+	  }
 
-      Copy-Item -Path $tempBinariesDir\$fullProjectName\$projectName.* -Destination $configurationDir\ -Recurse
+      Copy-Item -Path $tempBinariesDir\$fullProjectName\$projectName.* -Destination $configurationDir\ -Recurse	  	  
     }
   }
 }
@@ -167,7 +180,7 @@ task PackNuGet -depends Build -description "Create the NuGet packages" {
     New-Item -Path $projectLibFolder -ItemType Directory | Out-Null
 
     Copy-Item -Path $binariesDir\$projectName\* -Destination $projectLibFolder\ -Recurse
-
+	    
     Write-Host -ForegroundColor Green "Packaging $projectName..."
     Write-Host
 

diff --git a/src/Cimbalino.Toolkit (UWP)/Cimbalino.Toolkit (UWP).csproj b/src/Cimbalino.Toolkit (UWP)/Cimbalino.Toolkit (UWP).csproj
@@ -237,7 +237,9 @@
     <Compile Include="Services\LockScreenWithRequestService.cs" />
     <Compile Include="Services\PersonalizationService.cs" />
     <Compile Include="Services\TitleBarService.cs" />
-    <Content Include="Properties\Cimbalino.Toolkit__UWP_.rd.xml" />
+    <Content Include="Properties\Cimbalino.Toolkit.rd.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <SDKReference Include="BehaviorsXamlSDKManaged, Version=12.0">
@@ -257,15 +259,19 @@
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PropertiesFile Include="**\*.rd.xml"/>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
-  </Target>
+  </Target>-->
   <Target Name="AfterBuild">
+    <Copy SourceFiles="@(PropertiesFile)"
+          DestinationFolder="$(OutputPath)"/>
   </Target>
-  -->
 </Project>
diff --git a/...Properties/Cimbalino.Toolkit__UWP_.rd.xml → ...(UWP)/Properties/Cimbalino.Toolkit.rd.xml b/...Properties/Cimbalino.Toolkit__UWP_.rd.xml → ...(UWP)/Properties/Cimbalino.Toolkit.rd.xml
@@ -25,7 +25,7 @@
     http://go.microsoft.com/fwlink/?LinkId=613100
 -->
 <Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Library Name="Cimbalino.Toolkit__UWP_">
+  <Library Name="Cimbalino.Toolkit">
 
   	<!-- add directives for your library here -->
 

diff --git a/src/Cimbalino.Toolkit.Core (UWP)/Cimbalino.Toolkit.Core (UWP).csproj b/src/Cimbalino.Toolkit.Core (UWP)/Cimbalino.Toolkit.Core (UWP).csproj
@@ -503,7 +503,9 @@
     <Compile Include="Helpers\ApiHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Services\LockScreenService.cs" />
-    <Content Include="Properties\Cimbalino.Toolkit.Core__UWP_.rd.xml" />
+    <Content Include="Properties\Cimbalino.Toolkit.Core.rd.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <SDKReference Include="WindowsDesktop, Version=10.0.10240.0">
@@ -513,15 +515,19 @@
       <Name>Windows Mobile Extensions for the UWP</Name>
     </SDKReference>
   </ItemGroup>
+  <ItemGroup>
+    <PropertiesFile Include="**\*.rd.xml" />
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
-  </Target>
+  </Target>-->
   <Target Name="AfterBuild">
+    <Copy SourceFiles="@(PropertiesFile)"
+          DestinationFolder="$(OutputPath)" />
   </Target>
-  -->
 </Project>
diff --git a/...rties/Cimbalino.Toolkit.Core__UWP_.rd.xml → .../Properties/Cimbalino.Toolkit.Core.rd.xml b/...rties/Cimbalino.Toolkit.Core__UWP_.rd.xml → .../Properties/Cimbalino.Toolkit.Core.rd.xml
@@ -25,7 +25,7 @@
     http://go.microsoft.com/fwlink/?LinkId=613100
 -->
 <Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Library Name="Cimbalino.Toolkit.Core__UWP_">
+  <Library Name="Cimbalino.Toolkit.Core">
 
   	<!-- add directives for your library here -->