WAF Change version number to 4.1.0.7; Fix UWP NuGet package creation

jbe2277 · Aug 19, 2017 · 37d18ed · 37d18ed
1 parent 164e898
commit 37d18ed
Show file tree

Hide file tree

Showing 12 changed files with 96 additions and 11 deletions.
diff --git a/pkg/NuPack.bat b/pkg/NuPack.bat
@@ -2,7 +2,8 @@
 setlocal
 set PkgDir=%~dp0
 set PATH=%PATH%;%PkgDir%
-set PackParams=-IncludeReferencedProjects -Symbols -Properties Configuration=Release -MinClientVersion 3.1 -OutputDirectory System.Waf\Release
+set MinPackParams=-IncludeReferencedProjects -Symbols -Properties Configuration=Release -MinClientVersion 3.1
+set PackParams=%MinPackParams=% -OutputDirectory System.Waf\Release
 
 cd %PkgDir%
 if not exist "System.Waf\Release" mkdir System.Waf\Release
@@ -13,4 +14,18 @@ nuget pack ..\src\System.Waf\System.Waf\System.Waf.UnitTesting.Core\System.Waf.U
 nuget pack ..\src\System.Waf\System.Waf\System.Waf.Wpf\System.Waf.Wpf.csproj %PackParams%
 nuget pack ..\src\System.Waf\System.Waf\System.Waf.UnitTesting.Wpf\System.Waf.UnitTesting.Wpf.csproj %PackParams%
 
-nuget pack ..\src\System.Waf\System.Waf\System.Waf.Uwp\System.Waf.Uwp.csproj %PackParams%
+rem UWP .csproj projects are not supported by NuGet correctly - missing some important files.
+rem |-- Workaround: Create nupkg from .csproj; read created nuspec; update template nuspec; create final package
+
+nuget pack ..\src\System.Waf\System.Waf\System.Waf.Uwp\System.Waf.Uwp.csproj %MinPackParams% -OutputDirectory Temp
+
+FOR %%F IN (%PkgDir%Temp\*.nupkg) DO (
+ set TemplateNupkg=%%F
+ goto found
+)
+:found
+
+powershell -NoProfile -ExecutionPolicy Bypass -Command "& '%~dp0Update-Nuspec.ps1' -Nuspec '..\src\System.Waf\System.Waf\System.Waf.Uwp\System.Waf.Uwp-2.nuspec' -TemplateNupkg '%TemplateNupkg%' -TemplateNuspec 'System.Waf.Uwp.nuspec'"
+rmdir /S /Q %PkgDir%Temp
+
+nuget pack ..\src\System.Waf\System.Waf\System.Waf.Uwp\System.Waf.Uwp-2.nuspec %PackParams%
diff --git a/pkg/NuPush.bat b/pkg/NuPush.bat
@@ -2,7 +2,7 @@
 setlocal
 set PkgDir=%~dp0
 set PATH=%PATH%;%PkgDir%
-set Version=4.1.0-alpha6
+set Version=4.1.0-alpha7
 
 cd %PkgDir%\System.Waf\Release\%Version%
 

diff --git a/pkg/Update-NuSpec.ps1 b/pkg/Update-NuSpec.ps1
@@ -0,0 +1,32 @@
+param(
+    [Parameter(mandatory=$true)][string] $Nuspec,
+    [Parameter(mandatory=$true)][string] $TemplateNupkg,
+    [Parameter(mandatory=$true)][string] $TemplateNuspec
+)
+
+$Nuspec = Resolve-Path $Nuspec
+$TemplateNupkg = Resolve-Path $TemplateNupkg
+
+Add-Type -Assembly System.IO.Compression.FileSystem
+$ZipArchive = [System.IO.Compression.ZipFile]::OpenRead($TemplateNupkg)
+$ZipArchiveEntry = $ZipArchive.GetEntry($TemplateNuspec)
+$EntryStream = $ZipArchiveEntry.Open()
+$TemplateXml = New-Object System.Xml.XmlDocument
+$TemplateXml.Load($EntryStream)
+
+[xml] $TargetXml = Get-Content $Nuspec
+$TargetXml.package.metadata.id = $TemplateXml.package.metadata.id
+$TargetXml.package.metadata.version = $TemplateXml.package.metadata.version
+$TargetXml.package.metadata.title = $TemplateXml.package.metadata.title
+$TargetXml.package.metadata.description = $TemplateXml.package.metadata.description
+$TargetXml.package.metadata.authors = $TemplateXml.package.metadata.authors
+$TargetXml.package.metadata.owners = $TemplateXml.package.metadata.owners
+$TargetXml.package.metadata.copyright = $TemplateXml.package.metadata.copyright
+
+$newDependencies = $TargetXml.ImportNode($TemplateXml.package.metadata.dependencies, $true)
+$TargetXml.package.metadata.ReplaceChild($newDependencies, $TargetXml.package.metadata.dependencies)
+
+$TargetXml.Save($Nuspec)
+
+$EntryStream.Dispose()
+$ZipArchive.Dispose()
diff --git a/src/System.Waf/Documentation/Changelog.txt b/src/System.Waf/Documentation/Changelog.txt
@@ -1,6 +1,10 @@
 Changelog
 ---------
 
+Version 4.1.0.7 (Milestone 7)
+- WAF: Fix UWP NuGet package creation
+
+
 Version 4.1.0.6 (Milestone 6)
 - WAF: <Breaking change> The WAF assemblies are not signed with the strong name anymore.
 - WAF: Remove Timer from ThrottleAction (Timer is not supported by PCL Profile7)

diff --git a/src/System.Waf/SharedAssemblyInfo.cs b/src/System.Waf/SharedAssemblyInfo.cs
@@ -13,6 +13,6 @@
 [assembly: NeutralResourcesLanguage("en-US")]
 
 
-[assembly: AssemblyVersion("4.1.0.6")]
-[assembly: AssemblyFileVersion("4.1.0.6")]
-[assembly: AssemblyInformationalVersion("4.1.0-alpha6")]
+[assembly: AssemblyVersion("4.1.0.7")]
+[assembly: AssemblyFileVersion("4.1.0.7")]
+[assembly: AssemblyInformationalVersion("4.1.0-alpha7")]
diff --git a/src/System.Waf/System.Waf/System.Waf.Core/System.Waf.Core.nuspec b/src/System.Waf/System.Waf/System.Waf.Core/System.Waf.Core.nuspec
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
     <id>$id$</id>
     <version>$version$</version>

diff --git a/src/System.Waf/System.Waf/System.Waf.UnitTesting.Core/System.Waf.UnitTesting.Core.nuspec b/src/System.Waf/System.Waf/System.Waf.UnitTesting.Core/System.Waf.UnitTesting.Core.nuspec
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
     <id>$id$</id>
     <version>$version$</version>

diff --git a/src/System.Waf/System.Waf/System.Waf.UnitTesting.Wpf/System.Waf.UnitTesting.Wpf.nuspec b/src/System.Waf/System.Waf/System.Waf.UnitTesting.Wpf/System.Waf.UnitTesting.Wpf.nuspec
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
     <id>$id$</id>
     <version>$version$</version>

diff --git a/src/System.Waf/System.Waf/System.Waf.Uwp/System.Waf.Uwp-2.nuspec b/src/System.Waf/System.Waf/System.Waf.Uwp/System.Waf.Uwp-2.nuspec
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
+  <metadata>
+    <id>System.Waf.Uwp</id>
+    <version>4.1.0-alpha7</version>
+    <title>System.Waf.Uwp</title>
+    <description>System.Waf is a lightweight framework that helps you to create well-structured XAML applications. This package contains the UWP (Universal Windows Platform) specific types.</description>
+    <authors>jbe2277</authors>
+    <owners>jbe2277</owners>
+    <copyright>Copyright © 2017 jbe2277</copyright>
+    <projectUrl>https://github.com/jbe2277/waf</projectUrl>
+    <licenseUrl>https://raw.githubusercontent.com/jbe2277/waf/master/LICENSE</licenseUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <tags>WAF WPF MVVM XAML UWP Model-View-ViewModel UI MVC ViewModel PresentationModel Architecture Module Layered</tags>
+    <releaseNotes>https://github.com/jbe2277/waf/releases</releaseNotes>
+    <dependencies>
+      <group targetFramework="UAP10.0">
+        <dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="5.1.0" exclude="Build,Analyzers" />
+        <dependency id="System.Waf.Core" version="4.1.0-alpha7" />
+      </group>
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="..\..\..\..\out\System.Waf\Release\System.Waf.Uwp.dll" target="lib\uap10.0" />
+    <file src="..\..\..\..\out\System.Waf\Release\System.Waf.Uwp.xml" target="lib\uap10.0" />
+    <file src="..\..\..\..\out\System.Waf\Release\System.Waf.Uwp.pdb" target="lib\uap10.0" />
+    <file src="..\..\..\..\out\System.Waf\Release\System.Waf.Uwp.pri" target="lib\uap10.0" />
+    <file src="..\..\..\..\out\System.Waf\Release\System.Waf.Uwp.xr.xml" target="lib\uap10.0\System.Waf.Uwp" />
+    <file src="..\..\..\..\out\System.Waf\Release\Themes\Generic.xbf" target="lib\uap10.0\System.Waf.Uwp\Themes" />
+    <file src="**\*.cs" target="src" />
+    <file src="**\*.xaml" target="src" />
+  </files>
+</package>
diff --git a/src/System.Waf/System.Waf/System.Waf.Uwp/System.Waf.Uwp.csproj b/src/System.Waf/System.Waf/System.Waf.Uwp/System.Waf.Uwp.csproj
@@ -42,6 +42,7 @@
   <ItemGroup>
     <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
     <None Include="project.json" />
+    <None Include="System.Waf.Uwp-2.nuspec" />
     <None Include="System.Waf.Uwp.nuspec" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/System.Waf/System.Waf/System.Waf.Uwp/System.Waf.Uwp.nuspec b/src/System.Waf/System.Waf/System.Waf.Uwp/System.Waf.Uwp.nuspec
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
     <id>$id$</id>
     <version>$version$</version>

diff --git a/src/System.Waf/System.Waf/System.Waf.Wpf/System.Waf.Wpf.nuspec b/src/System.Waf/System.Waf/System.Waf.Wpf/System.Waf.Wpf.nuspec
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
     <id>$id$</id>
     <version>$version$</version>