Updated assembly version and output of setup package

SURFnet · Nov 23, 2017 · 822433c · 822433c
1 parent 582763b
commit 822433c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/SURFnet.Authentication.Adfs.Plugin/Properties/AssemblyInfo.cs b/src/SURFnet.Authentication.Adfs.Plugin/Properties/AssemblyInfo.cs
@@ -48,6 +48,5 @@
 // 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("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.0")]
 [assembly: log4net.Config.XmlConfigurator(ConfigFile = "SURFnet.Authentication.ADFS.MFA.Plugin.log4net")]
diff --git a/src/SURFnet.Authentication.Adfs.Plugin/SURFnet.Authentication.Adfs.Plugin.csproj b/src/SURFnet.Authentication.Adfs.Plugin/SURFnet.Authentication.Adfs.Plugin.csproj
@@ -38,7 +38,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>../../SolutionItems/SURFnet.Authentication.Adfs.Plugin.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\SolutionItems\SURFnet.Authentication.Adfs.Plugin.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
@@ -157,8 +157,8 @@
   </ItemGroup>
   <Target Name="BuildPackage">
     <Message Importance="High" Text="Zipping files..." />
-    <Zip Files="@(Binaries);@(SetupFiles)" WorkingDirectory="$(TargetDir)" ZipFileName="$(ProjectDir)Setup\SetupPackage.zip" />
-    <Message Importance="High" Text="Created setup package: $(ProjectDir)Setup\SetupPackage.zip" />
+    <Zip Files="@(Binaries);@(SetupFiles)" WorkingDirectory="$(TargetDir)" ZipFileName="..\..\..\SetupPackage.zip" />
+    <Message Importance="High" Text="Created setup package" />
   </Target>
   <!-- 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.