Skip to content

Commit

Permalink
(GH-3339) StrongName signed assembly? Hey, it's 2018...
Browse files Browse the repository at this point in the history
Change scheme of FileVersion to MajorMinorPatchTag and AssemblyVersion to MajorMinorPatch

Closes #3339
  • Loading branch information
punker76 committed Sep 25, 2018
1 parent f84afcf commit b9ab758
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 3 deletions.
3 changes: 2 additions & 1 deletion GitVersion.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
assembly-versioning-scheme: MajorMinorPatchTag
assembly-versioning-scheme: MajorMinorPatch
assembly-file-versioning-scheme: MajorMinorPatchTag
mode: ContinuousDeployment
next-version: 2.0.0
branches:
Expand Down
9 changes: 8 additions & 1 deletion src/MahApps.Metro/MahApps.Metro.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="MSBuild.Sdk.Extras">
<!-- Project properties -->
<PropertyGroup>
Expand All @@ -7,6 +7,13 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<ExtrasDefaultPageExcludes>$(ExtrasDefaultPageExcludes);**\*.Template.xaml</ExtrasDefaultPageExcludes>
</PropertyGroup>
<!-- Sign assembly -->
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>$(MSBuildProjectDirectory)\..\SharedKey.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
</PropertyGroup>
<ItemGroup>
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" />
Expand Down
Binary file added src/SharedKey.snk
Binary file not shown.
1 change: 1 addition & 0 deletions src/build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ Task("Zip-Demos")
});

Task("Unit-Tests")
.WithCriteria(() => !local)
.Does(() =>
{
XUnit2(
Expand Down
2 changes: 1 addition & 1 deletion src/paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ NUGET
Caliburn.Micro (3.2)
Caliburn.Micro.Core (3.2)
Caliburn.Micro.Core (3.2)
ControlzEx (4.0.0-alpha0175)
ControlzEx (4.0.0-alpha0176)
Costura.Fody (3.1.2)
Fody (>= 3.2.4) - restriction: >= net46
ExposedObject (1.2)
Expand Down

0 comments on commit b9ab758

Please sign in to comment.