Permalink
Browse files

updates wrt move to github

  • Loading branch information...
1 parent 359e8bf commit 486a9169a9f4b9bc137e456ba8f1374e8c17e26a @fearthecowboy fearthecowboy committed Apr 26, 2011
Showing with 56 additions and 53 deletions.
  1. +0 −6 .bzrignore
  2. +6 −0 .gitignore
  3. +6 −16 CoAppInstaller.csproj
  4. +0 −20 coapp-stub.sln
  5. +12 −1 coapp.installer.manifest
  6. +14 −3 coapp.installer.wxs
  7. +5 −5 make-installer-msi.cmd
  8. +13 −2 policy.1.0.coapp.installer.manifest
View
@@ -1,6 +0,0 @@
-coapp-stub.5.1.ReSharper.user
-test.cmd
-coapp-stub.suo
-coapp-stub.suo
-obj
-CoAppInstaller.csproj.user
View
@@ -0,0 +1,6 @@
+*.suo
+*.user
+*.sdf
+*.opensdf
+obj
+bin
View
@@ -39,7 +39,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
- <CodeAnalysisLogFile>bin\Debug\coapp-stub.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+ <CodeAnalysisLogFile>bin\Debug\stub.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
<CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
<ErrorReport>prompt</ErrorReport>
@@ -56,7 +56,7 @@
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
- <CodeAnalysisLogFile>bin\Release\coapp-stub.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+ <CodeAnalysisLogFile>bin\Release\stub.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
<CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
<ErrorReport>prompt</ErrorReport>
@@ -76,7 +76,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
- <CodeAnalysisLogFile>bin\Debug\coapp-stub.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+ <CodeAnalysisLogFile>bin\Debug\stub.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
<CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
<ErrorReport>prompt</ErrorReport>
@@ -90,7 +90,7 @@
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
- <CodeAnalysisLogFile>bin\Release\coapp-stub.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+ <CodeAnalysisLogFile>bin\Release\stub.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
<CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
<ErrorReport>prompt</ErrorReport>
@@ -122,7 +122,7 @@
<DependentUpon>StubWindow.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="$(SolutionDir)\..\coapp-solution\Source\AssemblyStrongName.cs" />
+ <Compile Include="$(SolutionDir)\..\solution\Source\AssemblyStrongName.cs" />
<EmbeddedResource Include="StubWindow.resx">
<DependentUpon>StubWindow.cs</DependentUpon>
</EmbeddedResource>
@@ -152,23 +152,13 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PostBuildEvent>echo on
-if NOT "$(ConfigurationName)" == "Release" goto FIN
-
+ <PostBuildEvent>if NOT "$(ConfigurationName)" == "Release" goto FIN
echo [BEGIN POST BUILD]
-
-echo "=== Copy Files ==="
-echo copy "$(ProjectDir)coapp.installer.manifest" "$(TargetDir)coapp.installer.manifest"
copy "$(ProjectDir)coapp.installer.manifest" "$(TargetDir)coapp.installer.manifest"
-
-echo "$(ProjectDir)coapp.installer.wxs" "$(TargetDir)coapp.installer.wxs"
copy "$(ProjectDir)coapp.installer.wxs" "$(TargetDir)coapp.installer.wxs"
-
-echo copy "$(ProjectDir)policy.1.0.coapp.installer.manifest" "$(TargetDir)policy.1.0.coapp.installer.manifest"
copy "$(ProjectDir)policy.1.0.coapp.installer.manifest" "$(TargetDir)policy.1.0.coapp.installer.manifest"
copy "$(ProjectDir)make-installer-msi.cmd" "$(TargetDir)make-installer-msi.cmd"
-
cd "$(TargetDir)"
start /wait cmd.exe /c "$(TargetDir)make-installer-msi.cmd"
View
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoAppInstaller", "CoAppInstaller.csproj", "{8D2A182F-A781-482F-8C65-3B0D638FF700}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {8D2A182F-A781-482F-8C65-3B0D638FF700}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8D2A182F-A781-482F-8C65-3B0D638FF700}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8D2A182F-A781-482F-8C65-3B0D638FF700}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8D2A182F-A781-482F-8C65-3B0D638FF700}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
View
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <assemblyIdentity type="win32" name="coapp.installer" version="1.0.2.831" processorArchitecture="x86" publicKeyToken="820d50196d4e8857"></assemblyIdentity>
+ <assemblyIdentity type="win32" name="coapp.installer" version="1.0.2.837" processorArchitecture="x86" publicKeyToken="820d50196d4e8857"></assemblyIdentity>
<file name="coapp.installer.exe" hashalg="SHA1" />
</assembly>
@@ -516,3 +516,14 @@
+
+
+
+
+
+
+
+
+
+
+
View
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Product Id="*" Name="CoApp Installer" Language="1033" Manufacturer="Outercurve Foundation (CoApp Project)" Version="1.0.2.831" >
+ <Product Id="*" Name="CoApp Installer" Language="1033" Manufacturer="Outercurve Foundation (CoApp Project)" Version="1.0.2.837" >
<Package InstallerVersion="200" Compressed="yes" InstallPrivileges="elevated" /> <!-- InstallPrivileges="limited" is to tell Installer not to elevate to install this (the bootstrapper will elevate) -->
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
@@ -11,13 +11,13 @@
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
<Directory Id="INSTALLLOCATION" Name="Install_CoAppInstaller">
- <Component Id="coappinstaller_component" Guid="eecc0b57-7712-017b-3e0b-d6c74e9b860d">
+ <Component Id="coappinstaller_component" Guid="2ed57aa0-091e-b891-a638-285258437791">
<File Id="coapp_installer" Name="coapp.installer.exe" Source="coapp.installer.exe" Vital="yes" AssemblyManifest="coappinstaller_manifest" Assembly="win32" KeyPath="yes" />
<File Id="coappinstaller_manifest" Name="coapp.installer.manifest" Source="coapp.installer.manifest" Vital="yes" />
<File Id="coappinstaller_catalog" Name="coapp.installer.cat" Source="coapp.installer.cat" Vital="yes" />
</Component>
- <Component Id="coappinstaller_policy_component" Guid="997a3fa1-83ca-4620-6722-70097d4654d2">
+ <Component Id="coappinstaller_policy_component" Guid="1ca72ecd-d178-7337-7969-ba2106fa08b2">
<File Id="coappinstaller_policy_manifest" Name="policy.1.0.coapp.installer.manifest" Source="policy.1.0.coapp.installer.manifest" Vital="yes" AssemblyManifest="coappinstaller_policy_manifest" Assembly="win32" KeyPath="yes" />
<File Id="coappinstaller_policy_catalog" Name="policy.1.0.coapp.installer.cat" Source="policy.1.0.coapp.installer.cat" Vital="yes" />
</Component>
@@ -544,3 +544,14 @@
+
+
+
+
+
+
+
+
+
+
+
View
@@ -2,7 +2,7 @@
cd %~dp0
echo "=== Sign EXE ==="
-coapp-simplesigner.exe "coapp.installer.exe"
+..\..\..\..\solution\tools\simplesigner\simplesigner.exe "coapp.installer.exe"
echo "=== Create Manifest + Catalog ==="
"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\mt.exe" -manifest "coapp.installer.manifest" -hashupdate -makecdfs
@@ -13,14 +13,14 @@ echo "=== Create Policy Manifest + Catalog ==="
"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\MakeCat.Exe" "policy.1.0.coapp.installer.manifest.cdf"
echo "=== Sign Catalogs ==="
-coapp-simplesigner.exe --sign-only "coapp.installer.cat"
-coapp-simplesigner.exe --sign-only "policy.1.0.coapp.installer.cat"
+..\..\..\..\solution\tools\simplesigner\simplesigner.exe --sign-only "coapp.installer.cat"
+..\..\..\..\solution\tools\simplesigner\simplesigner.exe --sign-only "policy.1.0.coapp.installer.cat"
echo "=== Create MSI ==="
"c:\Program Files (x86)\Windows Installer XML v3.5\bin\candle.exe" "coapp.installer.wxs "
"c:\Program Files (x86)\Windows Installer XML v3.5\bin\light.exe" "coapp.installer.wixobj"
echo "=== Sign MSI ==="
-coapp-simplesigner.exe --sign-only "coapp.installer.msi"
+..\..\..\..\solution\tools\simplesigner\simplesigner.exe --sign-only "coapp.installer.msi"
-copy "coapp.installer.msi" ..\..\..\..\release\final
+if exist ..\..\..\..\release\final copy "coapp.installer.msi" ..\..\..\..\release\final
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <assemblyIdentity type="win32-policy" publicKeyToken="820d50196d4e8857" name="policy.1.0.coapp.installer" version="1.0.2.831" processorArchitecture="x86"/>
+ <assemblyIdentity type="win32-policy" publicKeyToken="820d50196d4e8857" name="policy.1.0.coapp.installer" version="1.0.2.837" processorArchitecture="x86"/>
<dependency>
<dependentAssembly>
<assemblyIdentity type="win32" publicKeyToken="820d50196d4e8857" name="coapp.installer" processorArchitecture="x86"/>
- <bindingRedirect oldVersion="1.0.0.0-1.0.2.830" newVersion="1.0.2.831"/>
+ <bindingRedirect oldVersion="1.0.0.0-1.0.2.836" newVersion="1.0.2.837"/>
</dependentAssembly>
</dependency>
</assembly>
@@ -521,3 +521,14 @@
+
+
+
+
+
+
+
+
+
+
+

0 comments on commit 486a916

Please sign in to comment.