Alter how the office references are pulled in an change the build config

basicbh · Apr 26, 2018 · 593f175 · 593f175
1 parent 2eba29b
commit 593f175
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,8 @@
 OfficeToPDF.suo
+sign-files.bat
+.vs
+OfficeToPDF/bin
+OfficeToPDF/obj
 OfficeToPDF/OfficeToPDF.csproj.user
 OfficeToPDF/bin/Release/OfficeToPDF.exe
 OfficeToPDF/bin/Release/OfficeToPDF.pdb

diff --git a/OfficeToPDF.sln b/OfficeToPDF.sln
@@ -1,6 +1,8 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27428.2037
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OfficeToPDF", "OfficeToPDF\OfficeToPDF.csproj", "{13F3BAB7-27FF-4391-A0FA-B56E84A12A20}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{EACE67AE-B856-4DD2-8CFA-6927E0B7E9BC}"
@@ -21,6 +23,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		LICENSE.md = LICENSE.md
 		README.md = README.md
+		sign-files.bat = sign-files.bat
 	EndProjectSection
 EndProject
 Global
@@ -53,7 +56,8 @@ Global
 		{13F3BAB7-27FF-4391-A0FA-B56E84A12A20}.Release|x64.Build.0 = Release|x64
 		{13F3BAB7-27FF-4391-A0FA-B56E84A12A20}.Release|x86.ActiveCfg = Release|x86
 		{13F3BAB7-27FF-4391-A0FA-B56E84A12A20}.Release|x86.Build.0 = Release|x86
-		{13F3BAB7-27FF-4391-A0FA-B56E84A12A20}.Release-signed|Any CPU.ActiveCfg = Release-signed|x64
+		{13F3BAB7-27FF-4391-A0FA-B56E84A12A20}.Release-signed|Any CPU.ActiveCfg = Release-signed|x86
+		{13F3BAB7-27FF-4391-A0FA-B56E84A12A20}.Release-signed|Any CPU.Build.0 = Release-signed|x86
 		{13F3BAB7-27FF-4391-A0FA-B56E84A12A20}.Release-signed|Mixed Platforms.ActiveCfg = Release-signed|x64
 		{13F3BAB7-27FF-4391-A0FA-B56E84A12A20}.Release-signed|Mixed Platforms.Build.0 = Release-signed|x64
 		{13F3BAB7-27FF-4391-A0FA-B56E84A12A20}.Release-signed|x64.ActiveCfg = Release-signed|x64
@@ -64,4 +68,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {28AED493-F0C8-4DE2-9D3A-227F3A5CC7CF}
+	EndGlobalSection
 EndGlobal
diff --git a/OfficeToPDF/OfficeToPDF.csproj b/OfficeToPDF/OfficeToPDF.csproj
@@ -80,8 +80,8 @@
     <OutputPath>bin\x86\Release-signed\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <DebugType>none</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
@@ -92,7 +92,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
@@ -121,18 +121,23 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.Office.Interop.Outlook, Version=12.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
+      <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.Office.Interop.PowerPoint, Version=12.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
+      <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.Office.Interop.Publisher, Version=12.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
+      <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.Office.Interop.Visio, Version=12.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
+      <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.Office.Interop.Word, Version=12.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
+      <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="OFFICE, Version=12.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
@@ -223,19 +228,16 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>if $(ConfigurationName) == Release-signed goto :sign
+    <PostBuildEvent>if $(ConfigurationName) == Release-signed goto :signcheck
 
 goto :exit
 
-:sign
-SET SIGNTOOL=C:\Program Files\Microsoft SDKs\Windows\v7.0A\bin\signtool.exe
-SET TSS=http://timestamp.globalsign.com/?signature=sha2
-SET SNAME=Cognidox Limited
-SET ISSUER=GlobalSign CodeSigning CA - SHA256 - G2
-SET APPNAME=OfficeToPDF
-SET APPURL=https://www.cognidox.com/officetopdf-converter/
+:signcheck
+if exist $(SolutionDir)sign-files.bat goto :sign
+goto :exit
 
-"%25SIGNTOOL%25" sign /fd SHA256 /tr %25TSS%25 /td SHA256 /n "%25SNAME%25" /i "%25ISSUER%25" /d "%25APPNAME%25" /du "%25APPURL%25" "$(TargetPath)"
+:sign
+$(SolutionDir)sign-files.bat "$(TargetPath)"
 goto :exit
 
 :exit</PostBuildEvent>