Ubuntu One Windows Installer

Merge lp:~mandel/ubuntuone-windows-installer/make_anycpu_projects into lp:ubuntuone-windows-installer/beta

  1. make_anycpu_projects
  2. Merge into beta
Proposed by Manuel de la Peña
Status: Merged
Approved by: Rick McBride
Approved revision: 100
Merged at revision: 99
Proposed branch: lp:~mandel/ubuntuone-windows-installer/make_anycpu_projects
Merge into: lp:ubuntuone-windows-installer/beta
Prerequisite: lp:~mandel/ubuntuone-windows-installer/add_version_wix_var
Diff against target: 208 lines (+99/-5)
7 files modified
main.build (+1/-0)
src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj (+18/-0)
src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj (+17/-0)
src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj (+18/-0)
src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Canonical.UbuntuOne.ProcessDispatcher.Tests.csproj (+17/-0)
src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj (+18/-0)
src/UbuntuOne.sln (+10/-5)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/make_anycpu_projects
Reviewer Review Type Date Requested Status
Rick McBride (community) Approve
John Lenton (community) Approve
Review via email: mp+37737@code.launchpad.net

Description of the change

Fix lp:655622 by updating the arch used in the diff projects.

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) :
review: Approve
Revision history for this message
Rick McBride (rmcbride) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'main.build'
--- main.build 2010-10-06 13:18:01 +0000
+++ main.build 2010-10-06 13:18:01 +0000
@@ -152,6 +152,7 @@
152 <!-- use the msbuild action to compile the solution -->152 <!-- use the msbuild action to compile the solution -->
153 <msbuild project="src/UbuntuOne.sln"> 153 <msbuild project="src/UbuntuOne.sln">
154 <property name="Configuration" value="${enviroment}" /> 154 <property name="Configuration" value="${enviroment}" />
155 <property name="Platform" value="Any CPU" />
155 </msbuild>156 </msbuild>
156 157
157 </target>158 </target>
158159
=== modified file 'src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj'
--- src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj 2010-10-06 13:18:01 +0000
+++ src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj 2010-10-06 13:18:01 +0000
@@ -32,6 +32,24 @@
32 <PlatformTarget>x86</PlatformTarget>32 <PlatformTarget>x86</PlatformTarget>
33 <ConsolePause>false</ConsolePause>33 <ConsolePause>false</ConsolePause>
34 </PropertyGroup>34 </PropertyGroup>
35 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
36 <DebugSymbols>true</DebugSymbols>
37 <OutputPath>bin\Debug\</OutputPath>
38 <DefineConstants>DEBUG</DefineConstants>
39 <DocumentationFile>bin\Debug\Canonical.UbuntuOne.Client.XML</DocumentationFile>
40 <DebugType>full</DebugType>
41 <PlatformTarget>AnyCPU</PlatformTarget>
42 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
43 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
44 <ErrorReport>prompt</ErrorReport>
45 </PropertyGroup>
46 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
47 <OutputPath>bin\Release\</OutputPath>
48 <PlatformTarget>AnyCPU</PlatformTarget>
49 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
50 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
51 <ErrorReport>prompt</ErrorReport>
52 </PropertyGroup>
35 <ItemGroup>53 <ItemGroup>
36 <Compile Include="..\Version.cs">54 <Compile Include="..\Version.cs">
37 <Link>Properties\Version.cs</Link>55 <Link>Properties\Version.cs</Link>
3856
=== modified file 'src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj'
--- src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj 2010-08-20 08:32:22 +0000
+++ src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj 2010-10-06 13:18:01 +0000
@@ -33,6 +33,23 @@
33 <PlatformTarget>x86</PlatformTarget>33 <PlatformTarget>x86</PlatformTarget>
34 <ConsolePause>false</ConsolePause>34 <ConsolePause>false</ConsolePause>
35 </PropertyGroup>35 </PropertyGroup>
36 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
37 <DebugSymbols>true</DebugSymbols>
38 <OutputPath>bin\Debug\</OutputPath>
39 <DefineConstants>DEBUG</DefineConstants>
40 <DebugType>full</DebugType>
41 <PlatformTarget>AnyCPU</PlatformTarget>
42 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
43 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
44 <ErrorReport>prompt</ErrorReport>
45 </PropertyGroup>
46 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
47 <OutputPath>bin\Release\</OutputPath>
48 <PlatformTarget>AnyCPU</PlatformTarget>
49 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
50 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
51 <ErrorReport>prompt</ErrorReport>
52 </PropertyGroup>
36 <ItemGroup>53 <ItemGroup>
37 <Compile Include="..\Version.cs">54 <Compile Include="..\Version.cs">
38 <Link>Properties\Version.cs</Link>55 <Link>Properties\Version.cs</Link>
3956
=== modified file 'src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj'
--- src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj 2010-10-06 13:18:01 +0000
+++ src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj 2010-10-06 13:18:01 +0000
@@ -32,6 +32,24 @@
32 <PlatformTarget>x86</PlatformTarget>32 <PlatformTarget>x86</PlatformTarget>
33 <ConsolePause>false</ConsolePause>33 <ConsolePause>false</ConsolePause>
34 </PropertyGroup>34 </PropertyGroup>
35 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
36 <DebugSymbols>true</DebugSymbols>
37 <OutputPath>bin\Debug\</OutputPath>
38 <DefineConstants>DEBUG</DefineConstants>
39 <DocumentationFile>bin\Debug\Canonical.UbuntuOne.Common.XML</DocumentationFile>
40 <DebugType>full</DebugType>
41 <PlatformTarget>AnyCPU</PlatformTarget>
42 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
43 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
44 <ErrorReport>prompt</ErrorReport>
45 </PropertyGroup>
46 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
47 <OutputPath>bin\Release\</OutputPath>
48 <PlatformTarget>AnyCPU</PlatformTarget>
49 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
50 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
51 <ErrorReport>prompt</ErrorReport>
52 </PropertyGroup>
35 <ItemGroup>53 <ItemGroup>
36 <Compile Include="..\Version.cs">54 <Compile Include="..\Version.cs">
37 <Link>Properties\Version.cs</Link>55 <Link>Properties\Version.cs</Link>
3856
=== modified file 'src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Canonical.UbuntuOne.ProcessDispatcher.Tests.csproj'
--- src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Canonical.UbuntuOne.ProcessDispatcher.Tests.csproj 2010-08-24 16:09:12 +0000
+++ src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Canonical.UbuntuOne.ProcessDispatcher.Tests.csproj 2010-10-06 13:18:01 +0000
@@ -51,6 +51,23 @@
51 <PlatformTarget>x86</PlatformTarget>51 <PlatformTarget>x86</PlatformTarget>
52 <ConsolePause>false</ConsolePause>52 <ConsolePause>false</ConsolePause>
53 </PropertyGroup>53 </PropertyGroup>
54 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
55 <DebugSymbols>true</DebugSymbols>
56 <OutputPath>bin\Debug\</OutputPath>
57 <DefineConstants>DEBUG</DefineConstants>
58 <DebugType>full</DebugType>
59 <PlatformTarget>AnyCPU</PlatformTarget>
60 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
61 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
62 <ErrorReport>prompt</ErrorReport>
63 </PropertyGroup>
64 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
65 <OutputPath>bin\Release\</OutputPath>
66 <PlatformTarget>AnyCPU</PlatformTarget>
67 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
68 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
69 <ErrorReport>prompt</ErrorReport>
70 </PropertyGroup>
54 <ItemGroup>71 <ItemGroup>
55 <Compile Include="..\Version.cs">72 <Compile Include="..\Version.cs">
56 <Link>Properties\Version.cs</Link>73 <Link>Properties\Version.cs</Link>
5774
=== modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj'
--- src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj 2010-08-24 16:09:12 +0000
+++ src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj 2010-10-06 13:18:01 +0000
@@ -52,6 +52,24 @@
52 <PlatformTarget>x86</PlatformTarget>52 <PlatformTarget>x86</PlatformTarget>
53 <ConsolePause>false</ConsolePause>53 <ConsolePause>false</ConsolePause>
54 </PropertyGroup>54 </PropertyGroup>
55 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
56 <DebugSymbols>true</DebugSymbols>
57 <OutputPath>bin\Debug\</OutputPath>
58 <DefineConstants>DEBUG</DefineConstants>
59 <DocumentationFile>bin\Debug\Canonical.UbuntuOne.ProcessDispatcher.XML</DocumentationFile>
60 <DebugType>full</DebugType>
61 <PlatformTarget>AnyCPU</PlatformTarget>
62 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
63 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
64 <ErrorReport>prompt</ErrorReport>
65 </PropertyGroup>
66 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
67 <OutputPath>bin\Release\</OutputPath>
68 <PlatformTarget>AnyCPU</PlatformTarget>
69 <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
70 <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
71 <ErrorReport>prompt</ErrorReport>
72 </PropertyGroup>
55 <ItemGroup>73 <ItemGroup>
56 <None Include="App.config" />74 <None Include="App.config" />
57 <None Include="Config\log4net.config">75 <None Include="Config\log4net.config">
5876
=== modified file 'src/UbuntuOne.sln'
--- src/UbuntuOne.sln 2010-10-06 13:18:01 +0000
+++ src/UbuntuOne.sln 2010-10-06 13:18:01 +0000
@@ -39,7 +39,8 @@
39 Release|x86 = Release|x8639 Release|x86 = Release|x86
40 EndGlobalSection40 EndGlobalSection
41 GlobalSection(ProjectConfigurationPlatforms) = postSolution41 GlobalSection(ProjectConfigurationPlatforms) = postSolution
42 {7467483A-D6D5-4362-8DF4-57A7254EB569}.Debug|Any CPU.ActiveCfg = Debug|x8642 {7467483A-D6D5-4362-8DF4-57A7254EB569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43 {7467483A-D6D5-4362-8DF4-57A7254EB569}.Debug|Any CPU.Build.0 = Debug|Any CPU
43 {7467483A-D6D5-4362-8DF4-57A7254EB569}.Debug|Mixed Platforms.ActiveCfg = Debug|x8644 {7467483A-D6D5-4362-8DF4-57A7254EB569}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
44 {7467483A-D6D5-4362-8DF4-57A7254EB569}.Debug|Mixed Platforms.Build.0 = Debug|x8645 {7467483A-D6D5-4362-8DF4-57A7254EB569}.Debug|Mixed Platforms.Build.0 = Debug|x86
45 {7467483A-D6D5-4362-8DF4-57A7254EB569}.Debug|x86.ActiveCfg = Debug|x8646 {7467483A-D6D5-4362-8DF4-57A7254EB569}.Debug|x86.ActiveCfg = Debug|x86
@@ -49,7 +50,8 @@
49 {7467483A-D6D5-4362-8DF4-57A7254EB569}.Release|Mixed Platforms.Build.0 = Release|x8650 {7467483A-D6D5-4362-8DF4-57A7254EB569}.Release|Mixed Platforms.Build.0 = Release|x86
50 {7467483A-D6D5-4362-8DF4-57A7254EB569}.Release|x86.ActiveCfg = Release|x8651 {7467483A-D6D5-4362-8DF4-57A7254EB569}.Release|x86.ActiveCfg = Release|x86
51 {7467483A-D6D5-4362-8DF4-57A7254EB569}.Release|x86.Build.0 = Release|x8652 {7467483A-D6D5-4362-8DF4-57A7254EB569}.Release|x86.Build.0 = Release|x86
52 {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Debug|Any CPU.ActiveCfg = Debug|x8653 {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54 {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
53 {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Debug|Mixed Platforms.ActiveCfg = Debug|x8655 {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
54 {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Debug|Mixed Platforms.Build.0 = Debug|x8656 {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Debug|Mixed Platforms.Build.0 = Debug|x86
55 {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Debug|x86.ActiveCfg = Debug|x8657 {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Debug|x86.ActiveCfg = Debug|x86
@@ -59,7 +61,8 @@
59 {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Release|Mixed Platforms.Build.0 = Release|x8661 {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Release|Mixed Platforms.Build.0 = Release|x86
60 {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Release|x86.ActiveCfg = Release|x8662 {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Release|x86.ActiveCfg = Release|x86
61 {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Release|x86.Build.0 = Release|x8663 {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Release|x86.Build.0 = Release|x86
62 {9F0C15EE-6132-4431-8924-D65530F52CCE}.Debug|Any CPU.ActiveCfg = Debug|x8664 {9F0C15EE-6132-4431-8924-D65530F52CCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
65 {9F0C15EE-6132-4431-8924-D65530F52CCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
63 {9F0C15EE-6132-4431-8924-D65530F52CCE}.Debug|Mixed Platforms.ActiveCfg = Debug|x8666 {9F0C15EE-6132-4431-8924-D65530F52CCE}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
64 {9F0C15EE-6132-4431-8924-D65530F52CCE}.Debug|Mixed Platforms.Build.0 = Debug|x8667 {9F0C15EE-6132-4431-8924-D65530F52CCE}.Debug|Mixed Platforms.Build.0 = Debug|x86
65 {9F0C15EE-6132-4431-8924-D65530F52CCE}.Debug|x86.ActiveCfg = Debug|x8668 {9F0C15EE-6132-4431-8924-D65530F52CCE}.Debug|x86.ActiveCfg = Debug|x86
@@ -69,7 +72,8 @@
69 {9F0C15EE-6132-4431-8924-D65530F52CCE}.Release|Mixed Platforms.Build.0 = Release|x8672 {9F0C15EE-6132-4431-8924-D65530F52CCE}.Release|Mixed Platforms.Build.0 = Release|x86
70 {9F0C15EE-6132-4431-8924-D65530F52CCE}.Release|x86.ActiveCfg = Release|x8673 {9F0C15EE-6132-4431-8924-D65530F52CCE}.Release|x86.ActiveCfg = Release|x86
71 {9F0C15EE-6132-4431-8924-D65530F52CCE}.Release|x86.Build.0 = Release|x8674 {9F0C15EE-6132-4431-8924-D65530F52CCE}.Release|x86.Build.0 = Release|x86
72 {8D353509-C095-4E72-A693-3CEE97704C7D}.Debug|Any CPU.ActiveCfg = Debug|x8675 {8D353509-C095-4E72-A693-3CEE97704C7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
76 {8D353509-C095-4E72-A693-3CEE97704C7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
73 {8D353509-C095-4E72-A693-3CEE97704C7D}.Debug|Mixed Platforms.ActiveCfg = Debug|x8677 {8D353509-C095-4E72-A693-3CEE97704C7D}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
74 {8D353509-C095-4E72-A693-3CEE97704C7D}.Debug|Mixed Platforms.Build.0 = Debug|x8678 {8D353509-C095-4E72-A693-3CEE97704C7D}.Debug|Mixed Platforms.Build.0 = Debug|x86
75 {8D353509-C095-4E72-A693-3CEE97704C7D}.Debug|x86.ActiveCfg = Debug|x8679 {8D353509-C095-4E72-A693-3CEE97704C7D}.Debug|x86.ActiveCfg = Debug|x86
@@ -79,7 +83,8 @@
79 {8D353509-C095-4E72-A693-3CEE97704C7D}.Release|Mixed Platforms.Build.0 = Release|x8683 {8D353509-C095-4E72-A693-3CEE97704C7D}.Release|Mixed Platforms.Build.0 = Release|x86
80 {8D353509-C095-4E72-A693-3CEE97704C7D}.Release|x86.ActiveCfg = Release|x8684 {8D353509-C095-4E72-A693-3CEE97704C7D}.Release|x86.ActiveCfg = Release|x86
81 {8D353509-C095-4E72-A693-3CEE97704C7D}.Release|x86.Build.0 = Release|x8685 {8D353509-C095-4E72-A693-3CEE97704C7D}.Release|x86.Build.0 = Release|x86
82 {6C139C0B-FDBB-4DA3-9308-0E57531A085F}.Debug|Any CPU.ActiveCfg = Debug|x8686 {6C139C0B-FDBB-4DA3-9308-0E57531A085F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
87 {6C139C0B-FDBB-4DA3-9308-0E57531A085F}.Debug|Any CPU.Build.0 = Debug|Any CPU
83 {6C139C0B-FDBB-4DA3-9308-0E57531A085F}.Debug|Mixed Platforms.ActiveCfg = Debug|x8688 {6C139C0B-FDBB-4DA3-9308-0E57531A085F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
84 {6C139C0B-FDBB-4DA3-9308-0E57531A085F}.Debug|Mixed Platforms.Build.0 = Debug|x8689 {6C139C0B-FDBB-4DA3-9308-0E57531A085F}.Debug|Mixed Platforms.Build.0 = Debug|x86
85 {6C139C0B-FDBB-4DA3-9308-0E57531A085F}.Debug|x86.ActiveCfg = Debug|x8690 {6C139C0B-FDBB-4DA3-9308-0E57531A085F}.Debug|x86.ActiveCfg = Debug|x86

Subscribers

People subscribed via source and target branches

to all changes: