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

Commit 14fe284

Browse files
author
Koen Zwikstra
committed
version set to 1.0.8
removed obsolete build binaries msbuild file updated to include signing
1 parent c51a495 commit 14fe284

File tree

11 files changed

+136
-78
lines changed

11 files changed

+136
-78
lines changed

‎1.0/FirstFloor.ModernUI/Build/Binaries/NuGet.exe‎

-1.59 MB
Binary file not shown.

‎1.0/FirstFloor.ModernUI/Build/Binaries/signvsix.exe‎

-7 KB
Binary file not shown.

‎1.0/FirstFloor.ModernUI/Build/ModernUI.WPF.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>ModernUI.WPF</id>
5-
<version>1.0.7</version>
5+
<version>1.0.8</version>
66
<title>ModernUI for WPF</title>
77
<authors>First Floor Software</authors>
88
<owners>First Floor Software</owners>

‎1.0/FirstFloor.ModernUI/Build/ModernUI.msbuild‎

Lines changed: 65 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,19 @@
1111
<Platform>Any CPU</Platform>
1212

1313
<MSBuildExtensions>$(BinariesDir)\MSBuild.Community.Tasks.dll</MSBuildExtensions>
14-
<NuGetApp>$(BinariesDir)\NuGet.exe</NuGetApp>
15-
<SignVsixApp>$(BinariesDir)\signvsix.exe</SignVsixApp>
14+
<NuGetApp>NuGet.exe</NuGetApp>
1615

1716
<NuSpecFile>$(MSBuildProjectDirectory)\ModernUI.WPF.nuspec</NuSpecFile>
1817
<SolutionFile>$(BaseDir)\FirstFloor.ModernUI.sln</SolutionFile>
1918
<VsixSolutionFile>$(TemplatesDir)\ModernUI.Templates.sln</VsixSolutionFile>
2019
<VsixManifestFile>$(TemplatesDir)\ModernUI.Templates\source.extension.vsixmanifest</VsixManifestFile>
20+
<VsixOutputFile>$(TemplatesDir)\ModernUI.Templates\bin\Release\ModernUI.Templates.vsix</VsixOutputFile>
21+
22+
<!-- signing variables (private) -->
23+
<CertificateFilePath></CertificateFilePath>
24+
<CertificatePassword></CertificatePassword>
25+
<CertificateSha1></CertificateSha1>
26+
<VsixSignToolPath></VsixSignToolPath>
2127
</PropertyGroup>
2228

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

3339
<Target Name="Compile">
34-
<MSBuild Projects="$(SolutionFile)" Properties="Configuration=$(Configuration);Platform=$(Platform)" />
40+
<!-- enable signing -->
41+
<XmlUpdate
42+
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
43+
Prefix="ms"
44+
XmlFileName="$(BaseDir)\FirstFloor.ModernUI\FirstFloor.ModernUI.csproj"
45+
XPath="/ms:Project/ms:PropertyGroup/ms:SignAssembly"
46+
Value="true" />
47+
<XmlUpdate
48+
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
49+
Prefix="ms"
50+
XmlFileName="$(BaseDir)\FirstFloor.ModernUI\FirstFloor.ModernUI.csproj"
51+
XPath="/ms:Project/ms:PropertyGroup/ms:AssemblyOriginatorKeyFile"
52+
Value="$(CertificateFilePath)" />
53+
<XmlUpdate
54+
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
55+
Prefix="ms"
56+
XmlFileName="$(BaseDir)\FirstFloor.ModernUI.WPF4\FirstFloor.ModernUI.WPF4.csproj"
57+
XPath="/ms:Project/ms:PropertyGroup/ms:SignAssembly"
58+
Value="true" />
59+
<XmlUpdate
60+
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
61+
Prefix="ms"
62+
XmlFileName="$(BaseDir)\FirstFloor.ModernUI.WPF4\FirstFloor.ModernUI.WPF4.csproj"
63+
XPath="/ms:Project/ms:PropertyGroup/ms:AssemblyOriginatorKeyFile"
64+
Value="$(CertificateFilePath)" />
65+
66+
<MSBuild Projects="$(SolutionFile)" Properties="Configuration=$(Configuration);Platform=$(Platform)" />
67+
68+
<!-- disable signing -->
69+
<XmlUpdate
70+
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
71+
Prefix="ms"
72+
XmlFileName="$(BaseDir)\FirstFloor.ModernUI\FirstFloor.ModernUI.csproj"
73+
XPath="/ms:Project/ms:PropertyGroup/ms:SignAssembly"
74+
Value="false" />
75+
<XmlUpdate
76+
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
77+
Prefix="ms"
78+
XmlFileName="$(BaseDir)\FirstFloor.ModernUI\FirstFloor.ModernUI.csproj"
79+
XPath="/ms:Project/ms:PropertyGroup/ms:AssemblyOriginatorKeyFile"
80+
Value="" />
81+
<XmlUpdate
82+
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
83+
Prefix="ms"
84+
XmlFileName="$(BaseDir)\FirstFloor.ModernUI.WPF4\FirstFloor.ModernUI.WPF4.csproj"
85+
XPath="/ms:Project/ms:PropertyGroup/ms:SignAssembly"
86+
Value="false" />
87+
<XmlUpdate
88+
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
89+
Prefix="ms"
90+
XmlFileName="$(BaseDir)\FirstFloor.ModernUI.WPF4\FirstFloor.ModernUI.WPF4.csproj"
91+
XPath="/ms:Project/ms:PropertyGroup/ms:AssemblyOriginatorKeyFile"
92+
Value="" />
3593
</Target>
3694

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

204+
<!-- sign vsix -->
205+
<Exec Command='"$(VsixSignToolPath)" sign /f "$(CertificateFilePath)" /p $(CertificatePassword) /fd SHA1 /sha1 $(CertificateSha1) "$(VsixOutputFile)"' />
206+
146207
<!-- copy vsix to output folder-->
147-
<Copy SourceFiles="$(TemplatesDir)\ModernUI.Templates\bin\Release\ModernUI.Templates.vsix" DestinationFolder="$(OutputDir)" />
208+
<Copy SourceFiles="$(VsixOutputFile)" DestinationFolder="$(OutputDir)" />
148209

149210
</Target>
150211
</Project>

‎1.0/FirstFloor.ModernUI/FirstFloor.ModernUI.App/Properties/AssemblyInfo.cs‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
1-
using System.Reflection;
2-
using System.Resources;
3-
using System.Runtime.CompilerServices;
4-
using System.Runtime.InteropServices;
5-
using System.Windows;
6-
using System.Windows.Media;
7-
8-
// General Information about an assembly is controlled through the following
9-
// set of attributes. Change these attribute values to modify the information
10-
// associated with an assembly.
11-
[assembly: AssemblyTitle("ModernUI Demo App")]
12-
[assembly: AssemblyDescription("Demonstrating the features of Modern UI for WPF")]
13-
[assembly: AssemblyConfiguration("retail")]
14-
[assembly: AssemblyCompany("First Floor Software")]
15-
[assembly: AssemblyProduct("ModernUI demo")]
16-
[assembly: AssemblyCopyright("Copyright © First Floor Software 2013, 2014")]
17-
[assembly: AssemblyTrademark("")]
18-
[assembly: AssemblyCulture("")]
19-
20-
// Setting ComVisible to false makes the types in this assembly not visible
21-
// to COM components. If you need to access a type in this assembly from
22-
// COM, set the ComVisible attribute to true on that type.
23-
[assembly: ComVisible(false)]
24-
25-
//In order to begin building localizable applications, set
26-
//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
27-
//inside a <PropertyGroup>. For example, if you are using US english
28-
//in your source files, set the <UICulture> to en-US. Then uncomment
29-
//the NeutralResourceLanguage attribute below. Update the "en-US" in
30-
//the line below to match the UICulture setting in the project file.
31-
32-
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
33-
34-
// required for PerMonitor DPI support to work
35-
[assembly:DisableDpiAwareness]
36-
37-
38-
[assembly: ThemeInfo(
39-
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
40-
//(used if a resource is not found in the page,
41-
// or application resource dictionaries)
42-
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
43-
//(used if a resource is not found in the page,
44-
// app, or any theme specific resource dictionaries)
45-
)]
46-
47-
48-
// Version information for an assembly consists of the following four values:
49-
//
50-
// Major Version
51-
// Minor Version
52-
// Build Number
53-
// Revision
54-
//
55-
// You can specify all the values or you can default the Build and Revision Numbers
56-
// by using the '*' as shown below:
57-
// [assembly: AssemblyVersion("1.0.*")]
58-
[assembly: AssemblyVersion("1.0.0.0")]
59-
[assembly: AssemblyFileVersion("1.0.0.0")]
1+
using System.Reflection;
2+
using System.Resources;
3+
using System.Runtime.CompilerServices;
4+
using System.Runtime.InteropServices;
5+
using System.Windows;
6+
using System.Windows.Media;
7+
8+
// General Information about an assembly is controlled through the following
9+
// set of attributes. Change these attribute values to modify the information
10+
// associated with an assembly.
11+
[assembly: AssemblyTitle("ModernUI Demo App")]
12+
[assembly: AssemblyDescription("Demonstrating the features of Modern UI for WPF")]
13+
[assembly: AssemblyConfiguration("retail")]
14+
[assembly: AssemblyCompany("First Floor Software")]
15+
[assembly: AssemblyProduct("ModernUI demo")]
16+
[assembly: AssemblyCopyright("Copyright © First Floor Software 2013-2016")]
17+
[assembly: AssemblyTrademark("")]
18+
[assembly: AssemblyCulture("")]
19+
20+
// Setting ComVisible to false makes the types in this assembly not visible
21+
// to COM components. If you need to access a type in this assembly from
22+
// COM, set the ComVisible attribute to true on that type.
23+
[assembly: ComVisible(false)]
24+
25+
//In order to begin building localizable applications, set
26+
//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
27+
//inside a <PropertyGroup>. For example, if you are using US english
28+
//in your source files, set the <UICulture> to en-US. Then uncomment
29+
//the NeutralResourceLanguage attribute below. Update the "en-US" in
30+
//the line below to match the UICulture setting in the project file.
31+
32+
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
33+
34+
// required for PerMonitor DPI support to work
35+
[assembly:DisableDpiAwareness]
36+
37+
38+
[assembly: ThemeInfo(
39+
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
40+
//(used if a resource is not found in the page,
41+
// or application resource dictionaries)
42+
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
43+
//(used if a resource is not found in the page,
44+
// app, or any theme specific resource dictionaries)
45+
)]
46+
47+
48+
// Version information for an assembly consists of the following four values:
49+
//
50+
// Major Version
51+
// Minor Version
52+
// Build Number
53+
// Revision
54+
//
55+
// You can specify all the values or you can default the Build and Revision Numbers
56+
// by using the '*' as shown below:
57+
// [assembly: AssemblyVersion("1.0.*")]
58+
[assembly: AssemblyVersion("1.0.0.0")]
59+
[assembly: AssemblyFileVersion("1.0.0.0")]

‎1.0/FirstFloor.ModernUI/FirstFloor.ModernUI.Templates/ModernUI.App/ModernUI.App.vstemplate‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</WizardExtension>
3131
<WizardData>
3232
<packages repository="extension" repositoryId="ModernUI.Templates..f6db4f98-80c1-42cc-8f57-b9b52c916ce9">
33-
<package id="ModernUI.WPF" version="1.0.7" />
33+
<package id="ModernUI.WPF" version="1.0.8" />
3434
</packages>
3535
</WizardData>
3636
</VSTemplate>

‎1.0/FirstFloor.ModernUI/FirstFloor.ModernUI.Templates/ModernUI.NavigationApp/ModernUI.NavigationApp.vstemplate‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</WizardExtension>
4444
<WizardData>
4545
<packages repository="extension" repositoryId="ModernUI.Templates..f6db4f98-80c1-42cc-8f57-b9b52c916ce9">
46-
<package id="ModernUI.WPF" version="1.0.7" />
46+
<package id="ModernUI.WPF" version="1.0.8" />
4747
</packages>
4848
</WizardData>
4949
</VSTemplate>

‎1.0/FirstFloor.ModernUI/FirstFloor.ModernUI.Templates/ModernUI.Templates/ModernUI.Templates.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
6464
<IncludeInVSIX>true</IncludeInVSIX>
6565
</Content>
66-
<Content Include="Packages\ModernUI.WPF.1.0.7.nupkg">
66+
<Content Include="Packages\ModernUI.WPF.1.0.8.nupkg">
6767
<IncludeInVSIX>true</IncludeInVSIX>
6868
</Content>
6969
<None Include="source.extension.vsixmanifest">

‎1.0/FirstFloor.ModernUI/FirstFloor.ModernUI.Templates/ModernUI.Templates/source.extension.vsixmanifest‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<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">
33
<Metadata>
4-
<Identity Id="ModernUI.Templates..f6db4f98-80c1-42cc-8f57-b9b52c916ce9" Version="1.0.7" Language="en-US" Publisher="First Floor Software" />
4+
<Identity Id="ModernUI.Templates..f6db4f98-80c1-42cc-8f57-b9b52c916ce9" Version="1.0.8" Language="en-US" Publisher="First Floor Software" />
55
<DisplayName>Modern UI for WPF Templates</DisplayName>
66
<Description xml:space="preserve">A collection of project and item templates for Modern UI for WPF.</Description>
77
<MoreInfo>https://github.com/firstfloorsoftware/mui</MoreInfo>
@@ -12,8 +12,8 @@
1212
<Tags>modern ui wpf</Tags>
1313
</Metadata>
1414
<Installation>
15-
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[11.0,]" />
16-
<InstallationTarget Id="Microsoft.VisualStudio.VSWinDesktopExpress" Version="[11.0,]" />
15+
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[11.0,)" />
16+
<InstallationTarget Id="Microsoft.VisualStudio.VSWinDesktopExpress" Version="[11.0,)" />
1717
</Installation>
1818
<Dependencies>
1919
</Dependencies>
@@ -28,5 +28,5 @@
2828
<Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="ModernUI.ModernWindow" d:TargetPath="|ModernUI.ModernWindow;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
2929
<Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="ModernUI.ModernDialog" d:TargetPath="|ModernUI.ModernDialog;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
3030
</Assets>
31-
<CustomExtension Type="ModernUI.WPF.1.0.7.nupkg">Packages/ModernUI.WPF.1.0.7.nupkg</CustomExtension>
31+
<CustomExtension Type="ModernUI.WPF.1.0.8.nupkg">Packages/ModernUI.WPF.1.0.8.nupkg</CustomExtension>
3232
</PackageManifest>

‎1.0/FirstFloor.ModernUI/FirstFloor.ModernUI.sln‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.31101.0
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.24720.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FirstFloor.ModernUI", "FirstFloor.ModernUI\FirstFloor.ModernUI.csproj", "{9A653A28-FE46-40E8-A14F-48B0E325165D}"
77
EndProject
@@ -32,8 +32,6 @@ EndProject
3232
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Binaries", "Binaries", "{14C3EC42-FD0C-4966-A684-AF2B1808A10A}"
3333
ProjectSection(SolutionItems) = preProject
3434
Build\Binaries\MSBuild.Community.Tasks.dll = Build\Binaries\MSBuild.Community.Tasks.dll
35-
Build\Binaries\NuGet.exe = Build\Binaries\NuGet.exe
36-
Build\Binaries\signvsix.exe = Build\Binaries\signvsix.exe
3735
EndProjectSection
3836
EndProject
3937
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "Shared\Shared.shproj", "{EEDA74FC-CA5A-4C06-9654-2600B74E2D1D}"
@@ -42,7 +40,6 @@ Global
4240
GlobalSection(SharedMSBuildProjectFiles) = preSolution
4341
Shared\Shared.projitems*{a0ea4572-2726-4585-8e17-3a81a0eafa61}*SharedItemsImports = 4
4442
Shared\Shared.projitems*{eeda74fc-ca5a-4c06-9654-2600b74e2d1d}*SharedItemsImports = 13
45-
Shared\Shared.projitems*{9a653a28-fe46-40e8-a14f-48b0e325165d}*SharedItemsImports = 4
4643
EndGlobalSection
4744
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4845
Debug|Any CPU = Debug|Any CPU

0 commit comments

Comments
 (0)