Skip to content
This repository has been archived by the owner on Sep 2, 2021. It is now read-only.

Commit

Permalink
version set to 1.0.8
Browse files Browse the repository at this point in the history
removed obsolete build binaries
msbuild file updated to include signing
  • Loading branch information
kozw committed Feb 8, 2016
1 parent c51a495 commit 14fe284
Show file tree
Hide file tree
Showing 11 changed files with 136 additions and 78 deletions.
Binary file removed 1.0/FirstFloor.ModernUI/Build/Binaries/NuGet.exe
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion 1.0/FirstFloor.ModernUI/Build/ModernUI.WPF.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>ModernUI.WPF</id>
<version>1.0.7</version>
<version>1.0.8</version>
<title>ModernUI for WPF</title>
<authors>First Floor Software</authors>
<owners>First Floor Software</owners>
Expand Down
69 changes: 65 additions & 4 deletions 1.0/FirstFloor.ModernUI/Build/ModernUI.msbuild
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,19 @@
<Platform>Any CPU</Platform>

<MSBuildExtensions>$(BinariesDir)\MSBuild.Community.Tasks.dll</MSBuildExtensions>
<NuGetApp>$(BinariesDir)\NuGet.exe</NuGetApp>
<SignVsixApp>$(BinariesDir)\signvsix.exe</SignVsixApp>
<NuGetApp>NuGet.exe</NuGetApp>

<NuSpecFile>$(MSBuildProjectDirectory)\ModernUI.WPF.nuspec</NuSpecFile>
<SolutionFile>$(BaseDir)\FirstFloor.ModernUI.sln</SolutionFile>
<VsixSolutionFile>$(TemplatesDir)\ModernUI.Templates.sln</VsixSolutionFile>
<VsixManifestFile>$(TemplatesDir)\ModernUI.Templates\source.extension.vsixmanifest</VsixManifestFile>
<VsixOutputFile>$(TemplatesDir)\ModernUI.Templates\bin\Release\ModernUI.Templates.vsix</VsixOutputFile>

<!-- signing variables (private) -->
<CertificateFilePath></CertificateFilePath>
<CertificatePassword></CertificatePassword>
<CertificateSha1></CertificateSha1>
<VsixSignToolPath></VsixSignToolPath>
</PropertyGroup>

<UsingTask AssemblyFile="$(MSBuildExtensions)" TaskName="MSBuild.Community.Tasks.XmlUpdate" />
Expand All @@ -31,7 +37,59 @@
</Target>

<Target Name="Compile">
<MSBuild Projects="$(SolutionFile)" Properties="Configuration=$(Configuration);Platform=$(Platform)" />
<!-- enable signing -->
<XmlUpdate
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
Prefix="ms"
XmlFileName="$(BaseDir)\FirstFloor.ModernUI\FirstFloor.ModernUI.csproj"
XPath="/ms:Project/ms:PropertyGroup/ms:SignAssembly"
Value="true" />
<XmlUpdate
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
Prefix="ms"
XmlFileName="$(BaseDir)\FirstFloor.ModernUI\FirstFloor.ModernUI.csproj"
XPath="/ms:Project/ms:PropertyGroup/ms:AssemblyOriginatorKeyFile"
Value="$(CertificateFilePath)" />
<XmlUpdate
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
Prefix="ms"
XmlFileName="$(BaseDir)\FirstFloor.ModernUI.WPF4\FirstFloor.ModernUI.WPF4.csproj"
XPath="/ms:Project/ms:PropertyGroup/ms:SignAssembly"
Value="true" />
<XmlUpdate
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
Prefix="ms"
XmlFileName="$(BaseDir)\FirstFloor.ModernUI.WPF4\FirstFloor.ModernUI.WPF4.csproj"
XPath="/ms:Project/ms:PropertyGroup/ms:AssemblyOriginatorKeyFile"
Value="$(CertificateFilePath)" />

<MSBuild Projects="$(SolutionFile)" Properties="Configuration=$(Configuration);Platform=$(Platform)" />

<!-- disable signing -->
<XmlUpdate
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
Prefix="ms"
XmlFileName="$(BaseDir)\FirstFloor.ModernUI\FirstFloor.ModernUI.csproj"
XPath="/ms:Project/ms:PropertyGroup/ms:SignAssembly"
Value="false" />
<XmlUpdate
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
Prefix="ms"
XmlFileName="$(BaseDir)\FirstFloor.ModernUI\FirstFloor.ModernUI.csproj"
XPath="/ms:Project/ms:PropertyGroup/ms:AssemblyOriginatorKeyFile"
Value="" />
<XmlUpdate
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
Prefix="ms"
XmlFileName="$(BaseDir)\FirstFloor.ModernUI.WPF4\FirstFloor.ModernUI.WPF4.csproj"
XPath="/ms:Project/ms:PropertyGroup/ms:SignAssembly"
Value="false" />
<XmlUpdate
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
Prefix="ms"
XmlFileName="$(BaseDir)\FirstFloor.ModernUI.WPF4\FirstFloor.ModernUI.WPF4.csproj"
XPath="/ms:Project/ms:PropertyGroup/ms:AssemblyOriginatorKeyFile"
Value="" />
</Target>

<Target Name="CopyOutput">
Expand Down Expand Up @@ -143,8 +201,11 @@
<!-- compile template solution -->
<MSBuild Projects="$(VsixSolutionFile)" Properties="Configuration=$(Configuration);Platform=$(Platform)" />

<!-- sign vsix -->
<Exec Command='"$(VsixSignToolPath)" sign /f "$(CertificateFilePath)" /p $(CertificatePassword) /fd SHA1 /sha1 $(CertificateSha1) "$(VsixOutputFile)"' />

<!-- copy vsix to output folder-->
<Copy SourceFiles="$(TemplatesDir)\ModernUI.Templates\bin\Release\ModernUI.Templates.vsix" DestinationFolder="$(OutputDir)" />
<Copy SourceFiles="$(VsixOutputFile)" DestinationFolder="$(OutputDir)" />

</Target>
</Project>
Original file line number Diff line number Diff line change
@@ -1,59 +1,59 @@
using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Windows;
using System.Windows.Media;

// 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("ModernUI Demo App")]
[assembly: AssemblyDescription("Demonstrating the features of Modern UI for WPF")]
[assembly: AssemblyConfiguration("retail")]
[assembly: AssemblyCompany("First Floor Software")]
[assembly: AssemblyProduct("ModernUI demo")]
[assembly: AssemblyCopyright("Copyright © First Floor Software 2013, 2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// 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
//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
//inside a <PropertyGroup>. For example, if you are using US english
//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)]

// required for PerMonitor DPI support to work
[assembly:DisableDpiAwareness]


[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.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Windows;
using System.Windows.Media;

// 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("ModernUI Demo App")]
[assembly: AssemblyDescription("Demonstrating the features of Modern UI for WPF")]
[assembly: AssemblyConfiguration("retail")]
[assembly: AssemblyCompany("First Floor Software")]
[assembly: AssemblyProduct("ModernUI demo")]
[assembly: AssemblyCopyright("Copyright © First Floor Software 2013-2016")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// 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
//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
//inside a <PropertyGroup>. For example, if you are using US english
//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)]

// required for PerMonitor DPI support to work
[assembly:DisableDpiAwareness]


[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.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="ModernUI.Templates..f6db4f98-80c1-42cc-8f57-b9b52c916ce9">
<package id="ModernUI.WPF" version="1.0.7" />
<package id="ModernUI.WPF" version="1.0.8" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="ModernUI.Templates..f6db4f98-80c1-42cc-8f57-b9b52c916ce9">
<package id="ModernUI.WPF" version="1.0.7" />
<package id="ModernUI.WPF" version="1.0.8" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Packages\ModernUI.WPF.1.0.7.nupkg">
<Content Include="Packages\ModernUI.WPF.1.0.8.nupkg">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<None Include="source.extension.vsixmanifest">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="ModernUI.Templates..f6db4f98-80c1-42cc-8f57-b9b52c916ce9" Version="1.0.7" Language="en-US" Publisher="First Floor Software" />
<Identity Id="ModernUI.Templates..f6db4f98-80c1-42cc-8f57-b9b52c916ce9" Version="1.0.8" Language="en-US" Publisher="First Floor Software" />
<DisplayName>Modern UI for WPF Templates</DisplayName>
<Description xml:space="preserve">A collection of project and item templates for Modern UI for WPF.</Description>
<MoreInfo>https://github.com/firstfloorsoftware/mui</MoreInfo>
Expand All @@ -12,8 +12,8 @@
<Tags>modern ui wpf</Tags>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[11.0,]" />
<InstallationTarget Id="Microsoft.VisualStudio.VSWinDesktopExpress" Version="[11.0,]" />
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[11.0,)" />
<InstallationTarget Id="Microsoft.VisualStudio.VSWinDesktopExpress" Version="[11.0,)" />
</Installation>
<Dependencies>
</Dependencies>
Expand All @@ -28,5 +28,5 @@
<Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="ModernUI.ModernWindow" d:TargetPath="|ModernUI.ModernWindow;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
<Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="ModernUI.ModernDialog" d:TargetPath="|ModernUI.ModernDialog;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
</Assets>
<CustomExtension Type="ModernUI.WPF.1.0.7.nupkg">Packages/ModernUI.WPF.1.0.7.nupkg</CustomExtension>
<CustomExtension Type="ModernUI.WPF.1.0.8.nupkg">Packages/ModernUI.WPF.1.0.8.nupkg</CustomExtension>
</PackageManifest>
7 changes: 2 additions & 5 deletions 1.0/FirstFloor.ModernUI/FirstFloor.ModernUI.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FirstFloor.ModernUI", "FirstFloor.ModernUI\FirstFloor.ModernUI.csproj", "{9A653A28-FE46-40E8-A14F-48B0E325165D}"
EndProject
Expand Down Expand Up @@ -32,8 +32,6 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Binaries", "Binaries", "{14C3EC42-FD0C-4966-A684-AF2B1808A10A}"
ProjectSection(SolutionItems) = preProject
Build\Binaries\MSBuild.Community.Tasks.dll = Build\Binaries\MSBuild.Community.Tasks.dll
Build\Binaries\NuGet.exe = Build\Binaries\NuGet.exe
Build\Binaries\signvsix.exe = Build\Binaries\signvsix.exe
EndProjectSection
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "Shared\Shared.shproj", "{EEDA74FC-CA5A-4C06-9654-2600B74E2D1D}"
Expand All @@ -42,7 +40,6 @@ Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Shared\Shared.projitems*{a0ea4572-2726-4585-8e17-3a81a0eafa61}*SharedItemsImports = 4
Shared\Shared.projitems*{eeda74fc-ca5a-4c06-9654-2600b74e2d1d}*SharedItemsImports = 13
Shared\Shared.projitems*{9a653a28-fe46-40e8-a14f-48b0e325165d}*SharedItemsImports = 4
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down
4 changes: 2 additions & 2 deletions 1.0/FirstFloor.ModernUI/Shared/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
// 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.0.7.0")]
[assembly: AssemblyFileVersion("1.0.7.0")]
[assembly: AssemblyVersion("1.0.8.0")]
[assembly: AssemblyFileVersion("1.0.8.0")]

[assembly: XmlnsDefinition("http://firstfloorsoftware.com/ModernUI", "FirstFloor.ModernUI.Presentation")]
[assembly: XmlnsDefinition("http://firstfloorsoftware.com/ModernUI", "FirstFloor.ModernUI.Windows")]
Expand Down

0 comments on commit 14fe284

Please sign in to comment.