mir/nbfc
2
0
Fork 0
mirror of https://github.com/hirschmann/nbfc synced 2025-09-03 07:35:18 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into dev

Browse Source 
Conflicts:
	NoteBookFanControl.sln
This commit is contained in:
Stefan Hirschmann
2013-12-04 15:04:06 +01:00
parent d59abb9b40 4298a20303
commit ea575c7b88
5 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
NbfcBootstrapper/Bootstrapper.wxs
View File

@@ -1,29 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:bal="http://schemas.microsoft.com/wix/BalExtension"> xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
<!--Includes--> <!--Includes-->
<?include $(var.NbfcSetup.ProjectDir)Constants.wxi ?> <?include $(var.NbfcSetup.ProjectDir)Constants.wxi ?>
<Bundle Name="$(var.ProductName)" Version="$(var.Version)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeGuid)" <Bundle Name="$(var.ProductName)" Version="$(var.Version)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeGuid)"
IconSourceFile="$(var.NbfcServiceClient.ProjectDir)nbfc.ico"> IconSourceFile="$(var.NbfcServiceClient.ProjectDir)nbfc.ico">
<BootstrapperApplicationRef Id="WixExtendedBootstrapperApplication.HyperlinkLicense"> <BootstrapperApplicationRef Id="WixExtendedBootstrapperApplication.HyperlinkLicense">
<Payload SourceFile="$(var.ProjectDir)Resources\logoside.png" /> <Payload SourceFile="$(var.ProjectDir)Resources\logoside.png" />
<Payload SourceFile="$(var.ProjectDir)Resources\logo.png" /> <Payload SourceFile="$(var.ProjectDir)Resources\logo.png" />
</BootstrapperApplicationRef> </BootstrapperApplicationRef>
<WixVariable Id="WixExtbaThemeXml" Value="$(var.ProjectDir)Resources\Bundle2Theme.xml" /> <WixVariable Id="WixExtbaThemeXml" Value="$(var.ProjectDir)Resources\Bundle2Theme.xml" />
<WixVariable Id="WixExtbaThemeWxl" Value="$(var.ProjectDir)Resources\HyperlinkTheme.wxl" /> <WixVariable Id="WixExtbaThemeWxl" Value="$(var.ProjectDir)Resources\HyperlinkTheme.wxl" />
<WixVariable Id="WixExtbaLogo" Value="$(var.ProjectDir)Resources\logo.png" />
<WixVariable Id="WixExtbaLicenseUrl" Value="" />
<Variable Name="InstallFolder" Type="string" Value="[ProgramFiles64Folder]$(var.ProductName)" />
<WixVariable Id="WixExtbaLogo" Value="$(var.ProjectDir)Resources\logo.png" />
<WixVariable Id="WixExtbaLicenseUrl" Value="" />
<Variable Name="InstallFolder" Type="string" Value="[ProgramFilesFolder]$(var.ProductName)"/>
<Chain> <Chain>
<PackageGroupRef Id="NetFx40Web"/> <PackageGroupRef Id="NetFx40Web"/>
<MsiPackage Compressed="yes" SourceFile="$(var.NbfcSetup.TargetPath)"> <MsiPackage Compressed="yes" SourceFile="$(var.NbfcSetup.TargetPath)">
<MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" /> <MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" />
</MsiPackage> </MsiPackage>
</Chain> </Chain>

2
NbfcBootstrapper/NbfcBootstrapper.wixproj
View File

@@ -25,7 +25,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<WixExtension Include="WixBalExtensionExt"> <WixExtension Include="WixBalExtensionExt">
<HintPath>..\..\..\..\..\..\Downloads\WixBalExtensionExt\WixBalExtensionExt.dll</HintPath> <HintPath>$(WixExtDir)\WixBalExtensionExt.dll</HintPath>
<Name>WixBalExtensionExt</Name> <Name>WixBalExtensionExt</Name>
</WixExtension> </WixExtension>
<WixExtension Include="WixNetFxExtension"> <WixExtension Include="WixNetFxExtension">

2
NbfcSetup/NbfcSetup.wixproj
View File

@@ -20,6 +20,8 @@
<OutputPath>bin\$(Configuration)\</OutputPath> <OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<DefineConstants>ConfigsDir=D:\Users\Stefan\Skydrive\Öffentlich\NBFC\Configs;ResourcesDir=D:\Users\Stefan\Documents\Visual Studio 2012\Projects\Desktop Software Projects\NoteBookFanControl\NbfcSetup\Resources</DefineConstants> <DefineConstants>ConfigsDir=D:\Users\Stefan\Skydrive\Öffentlich\NBFC\Configs;ResourcesDir=D:\Users\Stefan\Documents\Visual Studio 2012\Projects\Desktop Software Projects\NoteBookFanControl\NbfcSetup\Resources</DefineConstants>
<SuppressIces>ICE80</SuppressIces>
<SuppressValidation>False</SuppressValidation>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<DefineConstants>Debug;ConfigsDir=D:\Users\Stefan\Skydrive\Öffentlich\NBFC\Configs;ResourcesDir=D:\Users\Stefan\Documents\Visual Studio 2012\Projects\Desktop Software Projects\NoteBookFanControl\NbfcSetup\Resources</DefineConstants> <DefineConstants>Debug;ConfigsDir=D:\Users\Stefan\Skydrive\Öffentlich\NBFC\Configs;ResourcesDir=D:\Users\Stefan\Documents\Visual Studio 2012\Projects\Desktop Software Projects\NoteBookFanControl\NbfcSetup\Resources</DefineConstants>

2
NbfcSetup/Product.wxs
View File

@@ -56,7 +56,7 @@
<Fragment> <Fragment>
<!--Directory structure--> <!--Directory structure-->
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFiles64Folder"> <Directory Id="ProgramFilesFolder">
<Directory Id="INSTALLFOLDER" Name="$(var.ProductName)"> <Directory Id="INSTALLFOLDER" Name="$(var.ProductName)">
<Directory Id="ConfigsFolder" Name="Configs"/> <Directory Id="ConfigsFolder" Name="Configs"/>
</Directory> </Directory>

2
NoteBookFanControl.sln
View File

@@ -198,6 +198,8 @@ Global
{D709446B-7DEC-4F18-B2A2-638A2EF8AAA6}.Debug|x86.Build.0 = Debug|x86 {D709446B-7DEC-4F18-B2A2-638A2EF8AAA6}.Debug|x86.Build.0 = Debug|x86
{D709446B-7DEC-4F18-B2A2-638A2EF8AAA6}.Release Mono|Any CPU.ActiveCfg = Release|x86 {D709446B-7DEC-4F18-B2A2-638A2EF8AAA6}.Release Mono|Any CPU.ActiveCfg = Release|x86
{D709446B-7DEC-4F18-B2A2-638A2EF8AAA6}.Release Mono|Mixed Platforms.ActiveCfg = Release|x86 {D709446B-7DEC-4F18-B2A2-638A2EF8AAA6}.Release Mono|Mixed Platforms.ActiveCfg = Release|x86
{D709446B-7DEC-4F18-B2A2-638A2EF8AAA6}.Release|Any CPU.ActiveCfg = Release|x86
{D709446B-7DEC-4F18-B2A2-638A2EF8AAA6}.Release|Any CPU.Build.0 = Release|x86
{D709446B-7DEC-4F18-B2A2-638A2EF8AAA6}.Release Mono|Mixed Platforms.Build.0 = Release|x86 {D709446B-7DEC-4F18-B2A2-638A2EF8AAA6}.Release Mono|Mixed Platforms.Build.0 = Release|x86
{D709446B-7DEC-4F18-B2A2-638A2EF8AAA6}.Release Mono|x86.ActiveCfg = Release|x86 {D709446B-7DEC-4F18-B2A2-638A2EF8AAA6}.Release Mono|x86.ActiveCfg = Release|x86
{D709446B-7DEC-4F18-B2A2-638A2EF8AAA6}.Release Mono|x86.Build.0 = Release|x86 {D709446B-7DEC-4F18-B2A2-638A2EF8AAA6}.Release Mono|x86.Build.0 = Release|x86