Changeset 2320


Ignore:
Timestamp:
10/29/2011 9:13:04 AM (2 years ago)
Author:
lowjoel
Message:

Upgraded to VS2010 projects and WiX 3.5 for futureproofing

Location:
trunk/eraser
Files:
8 added
2 deleted
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/eraser

    • Property svn:ignore
      •  

        old new  
        77Version.wxs 
        88*.suo 
        9 *.ncb 
        109*.pfx 
        1110*.snk 
  • trunk/eraser/Eraser.BlackBox/Eraser.BlackBox.csproj

    r1994 r2320  
    11<?xml version="1.0" encoding="utf-8"?> 
    2 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 
     2<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 
    33  <PropertyGroup> 
    44    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 
     
    1111    <RootNamespace>Eraser.BlackBox</RootNamespace> 
    1212    <AssemblyName>Eraser.BlackBox</AssemblyName> 
    13     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> 
     13    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> 
    1414    <FileAlignment>512</FileAlignment> 
    1515    <SignAssembly>true</SignAssembly> 
    1616    <AssemblyOriginatorKeyFile>..\Strong Name.snk</AssemblyOriginatorKeyFile> 
     17    <FileUpgradeFlags> 
     18    </FileUpgradeFlags> 
     19    <OldToolsVersion>3.5</OldToolsVersion> 
     20    <UpgradeBackupLocation /> 
     21    <PublishUrl>publish\</PublishUrl> 
     22    <Install>true</Install> 
     23    <InstallFrom>Disk</InstallFrom> 
     24    <UpdateEnabled>false</UpdateEnabled> 
     25    <UpdateMode>Foreground</UpdateMode> 
     26    <UpdateInterval>7</UpdateInterval> 
     27    <UpdateIntervalUnits>Days</UpdateIntervalUnits> 
     28    <UpdatePeriodically>false</UpdatePeriodically> 
     29    <UpdateRequired>false</UpdateRequired> 
     30    <MapFileExtensions>true</MapFileExtensions> 
     31    <ApplicationRevision>0</ApplicationRevision> 
     32    <ApplicationVersion>1.0.0.%2a</ApplicationVersion> 
     33    <IsWebBootstrapper>false</IsWebBootstrapper> 
     34    <UseApplicationTrust>false</UseApplicationTrust> 
     35    <BootstrapperEnabled>true</BootstrapperEnabled> 
     36    <TargetFrameworkProfile /> 
    1737  </PropertyGroup> 
    1838  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> 
     
    2444    <ErrorReport>prompt</ErrorReport> 
    2545    <WarningLevel>4</WarningLevel> 
     46    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 
    2647  </PropertyGroup> 
    2748  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 
     
    3253    <ErrorReport>prompt</ErrorReport> 
    3354    <WarningLevel>4</WarningLevel> 
     55    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 
    3456  </PropertyGroup> 
    3557  <ItemGroup> 
     
    121143    </ProjectReference> 
    122144  </ItemGroup> 
     145  <ItemGroup> 
     146    <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> 
     147      <Visible>False</Visible> 
     148      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName> 
     149      <Install>false</Install> 
     150    </BootstrapperPackage> 
     151    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1"> 
     152      <Visible>False</Visible> 
     153      <ProductName>.NET Framework 3.5 SP1</ProductName> 
     154      <Install>true</Install> 
     155    </BootstrapperPackage> 
     156    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1"> 
     157      <Visible>False</Visible> 
     158      <ProductName>Windows Installer 3.1</ProductName> 
     159      <Install>true</Install> 
     160    </BootstrapperPackage> 
     161  </ItemGroup> 
    123162  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 
    124163  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.  
  • trunk/eraser/Eraser.BlackBox/Properties/Resources.Designer.cs

    r1973 r2320  
    22// <auto-generated> 
    33//     This code was generated by a tool. 
    4 //     Runtime Version:2.0.50727.4927 
     4//     Runtime Version:4.0.30319.237 
    55// 
    66//     Changes to this file may cause incorrect behavior and will be lost if 
     
    2020    // To add or remove a member, edit your .ResX file then rerun ResGen 
    2121    // with the /str option, or rebuild your VS project. 
    22     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] 
     22    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] 
    2323    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 
    2424    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] 
  • trunk/eraser/Eraser.DefaultPlugins/Eraser.DefaultPlugins.csproj

    r2192 r2320  
    1 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> 
     1<?xml version="1.0" encoding="utf-8"?> 
     2<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> 
    23  <PropertyGroup> 
    34    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 
     
    1213    <SignAssembly>true</SignAssembly> 
    1314    <AssemblyOriginatorKeyFile>..\Strong Name.snk</AssemblyOriginatorKeyFile> 
    14     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> 
     15    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> 
    1516    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent> 
    1617    <PublishUrl>publish\</PublishUrl> 
     
    2930    <UseApplicationTrust>false</UseApplicationTrust> 
    3031    <BootstrapperEnabled>true</BootstrapperEnabled> 
     32    <TargetFrameworkProfile /> 
    3133  </PropertyGroup> 
    3234  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> 
     
    3840    <ErrorReport>prompt</ErrorReport> 
    3941    <WarningLevel>4</WarningLevel> 
     42    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 
    4043  </PropertyGroup> 
    4144  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 
     
    4649    <ErrorReport>prompt</ErrorReport> 
    4750    <WarningLevel>4</WarningLevel> 
     51    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 
    4852  </PropertyGroup> 
    4953  <ItemGroup> 
     
    144148      <Private>False</Private> 
    145149    </ProjectReference> 
    146     <ProjectReference Include="..\Eraser.Util.Native\Eraser.Util.Native.vcproj"> 
     150    <ProjectReference Include="..\Eraser.Util.Native\Eraser.Util.Native.vcxproj"> 
    147151      <Project>{BCFE7D20-FC82-4BBE-BFE4-7B635D70D238}</Project> 
    148152      <Name>Eraser.Util.Native</Name> 
     
    221225    <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> 
    222226      <Visible>False</Visible> 
    223       <ProductName>.NET Framework Client Profile</ProductName> 
     227      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName> 
    224228      <Install>false</Install> 
    225229    </BootstrapperPackage> 
  • trunk/eraser/Eraser.Manager/Eraser.Manager.csproj

    r2055 r2320  
    1 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> 
     1<?xml version="1.0" encoding="utf-8"?> 
     2<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> 
    23  <PropertyGroup> 
    34    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 
     
    1314    <SignAssembly>true</SignAssembly> 
    1415    <AssemblyOriginatorKeyFile>..\Strong Name.snk</AssemblyOriginatorKeyFile> 
    15     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> 
     16    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> 
    1617    <PublishUrl>publish\</PublishUrl> 
    1718    <Install>true</Install> 
     
    2930    <UseApplicationTrust>false</UseApplicationTrust> 
    3031    <BootstrapperEnabled>true</BootstrapperEnabled> 
     32    <TargetFrameworkProfile /> 
    3133  </PropertyGroup> 
    3234  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> 
     
    3941    <WarningLevel>4</WarningLevel> 
    4042    <AllowUnsafeBlocks>true</AllowUnsafeBlocks> 
     43    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 
    4144  </PropertyGroup> 
    4245  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 
     
    4851    <WarningLevel>4</WarningLevel> 
    4952    <AllowUnsafeBlocks>true</AllowUnsafeBlocks> 
     53    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 
    5054  </PropertyGroup> 
    5155  <ItemGroup> 
     
    8387  </ItemGroup> 
    8488  <ItemGroup> 
    85     <ProjectReference Include="..\Eraser.Util.Native\Eraser.Util.Native.vcproj"> 
     89    <ProjectReference Include="..\Eraser.Util.Native\Eraser.Util.Native.vcxproj"> 
    8690      <Project>{BCFE7D20-FC82-4BBE-BFE4-7B635D70D238}</Project> 
    8791      <Name>Eraser.Util.Native</Name> 
     
    113117    <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> 
    114118      <Visible>False</Visible> 
    115       <ProductName>.NET Framework Client Profile</ProductName> 
     119      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName> 
    116120      <Install>false</Install> 
    117121    </BootstrapperPackage> 
  • trunk/eraser/Eraser.Util/Eraser.Util.csproj

    r2283 r2320  
    1 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> 
     1<?xml version="1.0" encoding="utf-8"?> 
     2<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> 
    23  <PropertyGroup> 
    34    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 
     
    1213    <SignAssembly>true</SignAssembly> 
    1314    <AssemblyOriginatorKeyFile>..\Strong Name.snk</AssemblyOriginatorKeyFile> 
    14     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> 
     15    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> 
    1516    <PublishUrl>publish\</PublishUrl> 
    1617    <Install>true</Install> 
     
    2829    <UseApplicationTrust>false</UseApplicationTrust> 
    2930    <BootstrapperEnabled>true</BootstrapperEnabled> 
     31    <TargetFrameworkProfile /> 
    3032  </PropertyGroup> 
    3133  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> 
     
    3840    <WarningLevel>4</WarningLevel> 
    3941    <AllowUnsafeBlocks>true</AllowUnsafeBlocks> 
    40     <CodeAnalysisRules>-Microsoft.Interoperability#CA1404;-Microsoft.Naming#CA1704;-Microsoft.Naming#CA1707</CodeAnalysisRules> 
     42    <CodeAnalysisRules> 
     43    </CodeAnalysisRules> 
     44    <CodeAnalysisRuleSet>Migrated rules for Eraser.Util.ruleset</CodeAnalysisRuleSet> 
    4145  </PropertyGroup> 
    4246  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 
     
    4852    <WarningLevel>4</WarningLevel> 
    4953    <AllowUnsafeBlocks>true</AllowUnsafeBlocks> 
     54    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 
    5055  </PropertyGroup> 
    5156  <ItemGroup> 
     
    132137    <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> 
    133138      <Visible>False</Visible> 
    134       <ProductName>.NET Framework Client Profile</ProductName> 
     139      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName> 
    135140      <Install>false</Install> 
    136141    </BootstrapperPackage> 
     
    168173    <EmbeddedResource Include="Strings.resx" /> 
    169174  </ItemGroup> 
     175  <ItemGroup> 
     176    <None Include="Migrated rules for Eraser.Util.ruleset" /> 
     177  </ItemGroup> 
    170178  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> 
    171179  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.  
  • trunk/eraser/Eraser.sln

    r2006 r2320  
    11 
    2 Microsoft Visual Studio Solution File, Format Version 10.00 
    3 # Visual Studio 2008 
     2Microsoft Visual Studio Solution File, Format Version 11.00 
     3# Visual Studio 2010 
    44Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4AA1FBC2-DA5C-4204-B152-B5929516DC48}" 
    55    ProjectSection(SolutionItems) = preProject 
     
    3939    EndProjectSection 
    4040EndProject 
    41 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Installer.Bootstrapper", "Installer\Bootstrapper\Bootstrapper.vcproj", "{4F6CD250-0A08-4DB8-8E07-848E4FF01C21}" 
    42     ProjectSection(ProjectDependencies) = postProject 
    43         {318964CF-278D-41B2-A825-B9A0D1F5D766} = {318964CF-278D-41B2-A825-B9A0D1F5D766} 
    44     EndProjectSection 
     41Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Installer.Bootstrapper", "Installer\Bootstrapper\Bootstrapper.vcxproj", "{4F6CD250-0A08-4DB8-8E07-848E4FF01C21}" 
    4542EndProject 
    46 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Eraser.Shell", "Eraser.Shell\ShellExt.vcproj", "{738F455B-2220-4F8F-B87F-DA93F0B0F1BA}" 
     43Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Eraser.Shell", "Eraser.Shell\ShellExt.vcxproj", "{738F455B-2220-4F8F-B87F-DA93F0B0F1BA}" 
    4744EndProject 
    48 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Eraser.Util.Native", "Eraser.Util.Native\Eraser.Util.Native.vcproj", "{BCFE7D20-FC82-4BBE-BFE4-7B635D70D238}" 
     45Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Eraser.Util.Native", "Eraser.Util.Native\Eraser.Util.Native.vcxproj", "{BCFE7D20-FC82-4BBE-BFE4-7B635D70D238}" 
    4946EndProject 
    5047Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eraser.BlackBox", "Eraser.BlackBox\Eraser.BlackBox.csproj", "{F8C3524E-B846-454B-BA41-5E2AA64BD56B}" 
  • trunk/eraser/Eraser/Eraser.csproj

    r2276 r2320  
    11<?xml version="1.0" encoding="utf-8"?> 
    2 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 
     2<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 
    33  <PropertyGroup> 
    44    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 
     
    1111    <RootNamespace>Eraser</RootNamespace> 
    1212    <AssemblyName>Eraser</AssemblyName> 
    13     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> 
     13    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> 
    1414    <FileAlignment>512</FileAlignment> 
    1515    <ApplicationIcon>..\Resources\Eraser.ico</ApplicationIcon> 
     
    3131    <UseApplicationTrust>false</UseApplicationTrust> 
    3232    <BootstrapperEnabled>true</BootstrapperEnabled> 
     33    <TargetFrameworkProfile /> 
    3334  </PropertyGroup> 
    3435  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> 
     
    4142    <WarningLevel>4</WarningLevel> 
    4243    <PlatformTarget>AnyCPU</PlatformTarget> 
     44    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 
    4345  </PropertyGroup> 
    4446  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 
     
    4951    <ErrorReport>prompt</ErrorReport> 
    5052    <WarningLevel>4</WarningLevel> 
     53    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 
    5154  </PropertyGroup> 
    5255  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 
    5356    <PlatformTarget>x86</PlatformTarget> 
    5457    <OutputPath>..\bin\Debug\</OutputPath> 
     58    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 
    5559  </PropertyGroup> 
    5660  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> 
    5761    <OutputPath>..\bin\Release\</OutputPath> 
     62    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 
    5863  </PropertyGroup> 
    5964  <ItemGroup> 
     
    381386    <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> 
    382387      <Visible>False</Visible> 
    383       <ProductName>.NET Framework Client Profile</ProductName> 
     388      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName> 
    384389      <Install>false</Install> 
    385390    </BootstrapperPackage> 
  • trunk/eraser/Eraser/Properties/Resources.Designer.cs

    r1974 r2320  
    22// <auto-generated> 
    33//     This code was generated by a tool. 
    4 //     Runtime Version:2.0.50727.4927 
     4//     Runtime Version:4.0.30319.237 
    55// 
    66//     Changes to this file may cause incorrect behavior and will be lost if 
     
    2020    // To add or remove a member, edit your .ResX file then rerun ResGen 
    2121    // with the /str option, or rebuild your VS project. 
    22     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] 
     22    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] 
    2323    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 
    2424    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] 
  • trunk/eraser/Eraser/Properties/Settings.Designer.cs

    r1359 r2320  
    22// <auto-generated> 
    33//     This code was generated by a tool. 
    4 //     Runtime Version:2.0.50727.1434 
     4//     Runtime Version:4.0.30319.237 
    55// 
    66//     Changes to this file may cause incorrect behavior and will be lost if 
     
    1313     
    1414    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] 
    15     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")] 
     15    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] 
    1616    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { 
    1717         
  • trunk/eraser/Installer/Installer.wixproj

    r2012 r2320  
    1 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 
     1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> 
    22  <PropertyGroup> 
    33    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 
     
    88    <OutputName>Eraser</OutputName> 
    99    <OutputType>Package</OutputType> 
    10     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath> 
     10    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath> 
    1111  </PropertyGroup> 
    1212  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 
     
    4747    <WixExtension Include="WixUIExtension"> 
    4848      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath> 
     49      <Name>WixUIExtension</Name> 
    4950    </WixExtension> 
    5051    <WixExtension Include="WixUtilExtension"> 
    5152      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath> 
     53      <Name>WixUtilExtension</Name> 
    5254    </WixExtension> 
    5355  </ItemGroup> 
Note: See TracChangeset for help on using the changeset viewer.