📌 v1.3.0

punker76 · Jan 16, 2016 · 6088824 · 6088824
1 parent aff25f5
commit 6088824
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 43 deletions.
diff --git a/MahApps.Metro.SimpleChildWindow/Build.cmd b/MahApps.Metro.SimpleChildWindow/Build.cmd
@@ -1,10 +1,10 @@
 @echo on
-call "%VS120COMNTOOLS%vsvars32.bat"
+REM call "%VS120COMNTOOLS%vsvars32.bat"
 
-msbuild.exe /ToolsVersion:4.0 "MahApps.Metro.SimpleChildWindow.sln" /p:configuration=Release /t:Clean,Rebuild
+REM msbuild.exe /ToolsVersion:4.0 "MahApps.Metro.SimpleChildWindow.sln" /p:configuration=Release /t:Clean,Rebuild
 .nuget\NuGet.exe pack %~dp0MahApps.Metro.SimpleChildWindow.nuspec -OutputDirectory %~dp0
 
-msbuild.exe /ToolsVersion:4.0 "MahApps.Metro.SimpleChildWindow.sln" /p:configuration=Debug /t:Clean,Rebuild
-.nuget\NuGet.exe pack %~dp0MahApps.Metro.SimpleChildWindow.ALPHA.nuspec -OutputDirectory %~dp0
+REM msbuild.exe /ToolsVersion:4.0 "MahApps.Metro.SimpleChildWindow.sln" /p:configuration=Debug /t:Clean,Rebuild
+REM .nuget\NuGet.exe pack %~dp0MahApps.Metro.SimpleChildWindow.ALPHA.nuspec -OutputDirectory %~dp0
 
 pause
diff --git a/MahApps.Metro.SimpleChildWindow/MahApps.Metro.SimpleChildWindow.ALPHA.nuspec b/MahApps.Metro.SimpleChildWindow/MahApps.Metro.SimpleChildWindow.ALPHA.nuspec
@@ -2,10 +2,10 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>MahApps.Metro.SimpleChildWindow</id>
-    <version>1.3.0-ALPHA002</version>
+    <version>1.3.1-ALPHA001</version>
     <title>MahApps.Metro.SimpleChildWindow</title>
-    <authors>Jan Karger (punker76)</authors>
-    <owners>Jan Karger</owners>
+    <authors>Jan Karger</authors>
+    <owners>punker76</owners>
     <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
     <projectUrl>https://github.com/punker76/MahApps.Metro.SimpleChildWindow</projectUrl>
     <iconUrl>https://raw.github.com/punker76/MahApps.Metro.SimpleChildWindow/master/MahApps.Metro.SimpleChildWindow/MahApps.Metro.SimpleChildWindow.png</iconUrl>

diff --git a/...ldWindow/MahApps.Metro.SimpleChildWindow.Demo/MahApps.Metro.SimpleChildWindow.Demo.csproj b/...ldWindow/MahApps.Metro.SimpleChildWindow.Demo/MahApps.Metro.SimpleChildWindow.Demo.csproj
@@ -36,14 +36,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="MahApps.Metro, Version=1.1.3.98, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MahApps.Metro.1.1.3-ALPHA098\lib\net45\MahApps.Metro.dll</HintPath>
+    <Reference Include="MahApps.Metro, Version=1.2.3.0, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
+      <HintPath>..\packages\MahApps.Metro.1.2.3.0\lib\net45\MahApps.Metro.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\MahApps.Metro.1.1.3-ALPHA098\lib\net45\System.Windows.Interactivity.dll</HintPath>
+      <HintPath>..\packages\MahApps.Metro.1.2.3.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml" />

diff --git a/MahApps.Metro.SimpleChildWindow/MahApps.Metro.SimpleChildWindow.Demo/packages.config b/MahApps.Metro.SimpleChildWindow/MahApps.Metro.SimpleChildWindow.Demo/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MahApps.Metro" version="1.1.3-ALPHA098" targetFramework="net45" />
+  <package id="MahApps.Metro" version="1.2.3.0" targetFramework="net45" />
   <package id="MahApps.Metro.Resources" version="0.4.0.0" targetFramework="net45" />
 </packages>
diff --git a/MahApps.Metro.SimpleChildWindow/MahApps.Metro.SimpleChildWindow.nuspec b/MahApps.Metro.SimpleChildWindow/MahApps.Metro.SimpleChildWindow.nuspec
@@ -4,8 +4,8 @@
     <id>MahApps.Metro.SimpleChildWindow</id>
     <version>1.3.0</version>
     <title>MahApps.Metro.SimpleChildWindow</title>
-    <authors>Jan Karger (punker76)</authors>
-    <owners>Jan Karger</owners>
+    <authors>Jan Karger</authors>
+    <owners>punker76</owners>
     <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
     <projectUrl>https://github.com/punker76/MahApps.Metro.SimpleChildWindow</projectUrl>
     <iconUrl>https://raw.github.com/punker76/MahApps.Metro.SimpleChildWindow/master/MahApps.Metro.SimpleChildWindow/MahApps.Metro.SimpleChildWindow.png</iconUrl>
@@ -15,7 +15,7 @@
     <releaseNotes/>
     <tags>WPF UI Metro ModernUI XAML Toolkit Library .NET</tags>
     <dependencies>
-      <dependency id="MahApps.Metro" />
+      <dependency id="MahApps.Metro" version="1.2.3" />
     </dependencies>
   </metadata>
   <files>

diff --git a/...ChildWindow/MahApps.Metro.SimpleChildWindow/MahApps.Metro.SimpleChildWindow (NET4).csproj b/...ChildWindow/MahApps.Metro.SimpleChildWindow/MahApps.Metro.SimpleChildWindow (NET4).csproj
@@ -38,6 +38,12 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>..\bin\Release\NET4\MahApps.Metro.SimpleChildWindow.XML</DocumentationFile>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>MahApps.Metro.SimpleChildWindow.pfx</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -81,6 +87,9 @@
     </Compile>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="MahApps.Metro.SimpleChildWindow.pfx" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.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.

diff --git a/....SimpleChildWindow/MahApps.Metro.SimpleChildWindow/MahApps.Metro.SimpleChildWindow.csproj b/....SimpleChildWindow/MahApps.Metro.SimpleChildWindow/MahApps.Metro.SimpleChildWindow.csproj
@@ -38,6 +38,12 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>..\bin\Release\MahApps.Metro.SimpleChildWindow.XML</DocumentationFile>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>MahApps.Metro.SimpleChildWindow.pfx</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -81,6 +87,9 @@
     </Compile>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="MahApps.Metro.SimpleChildWindow.pfx" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.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.

diff --git a/MahApps.Metro.SimpleChildWindow/MahApps.Metro.SimpleChildWindow/Properties/AssemblyInfo.cs b/MahApps.Metro.SimpleChildWindow/MahApps.Metro.SimpleChildWindow/Properties/AssemblyInfo.cs
@@ -2,17 +2,11 @@
 using System.Runtime.InteropServices;
 using System.Windows;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 [assembly: AssemblyTitle("MahApps.Metro.SimpleChildWindow")]
 [assembly: AssemblyDescription("A simple child window for MahApps.Metro")]
 [assembly: AssemblyCompany("MahApps")]
-[assembly: AssemblyCopyright("Copyright © Jan Karger 2014-2015")]
+[assembly: AssemblyCopyright("Copyright © Jan Karger 2014-2016")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
 //In order to begin building localizable applications, set 
@@ -21,30 +15,11 @@
 //in your source files, set the <UICulture> to en-US.  Then uncomment
 //the NeutralResourceLanguage attribute below.  Update the "en-US" in
 //the line below to match the UICulture setting in the project file.
-
 //[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
 
+[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
 
-[assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-  //(used if a resource is not found in the page, 
-  // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-  //(used if a resource is not found in the page, 
-  // app, or any theme specific resource dictionaries)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.3.0.0")]
 [assembly: AssemblyFileVersion("1.3.0.0")]
-[assembly: AssemblyProduct("MahApps.Metro.SimpleChildWindow 1.3.0-ALPHA002")]
+[assembly: AssemblyInformationalVersion("1.3.0.0")]
+[assembly: AssemblyProduct("MahApps.Metro.SimpleChildWindow 1.3.0")]