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
1=== modified file 'main.build'
2--- main.build 2010-10-06 13:18:01 +0000
3+++ main.build 2010-10-06 13:18:01 +0000
4@@ -152,6 +152,7 @@
5 <!-- use the msbuild action to compile the solution -->
6 <msbuild project="src/UbuntuOne.sln">
7 <property name="Configuration" value="${enviroment}" />
8+ <property name="Platform" value="Any CPU" />
9 </msbuild>
10
11 </target>
12
13=== modified file 'src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj'
14--- src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj 2010-10-06 13:18:01 +0000
15+++ src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj 2010-10-06 13:18:01 +0000
16@@ -32,6 +32,24 @@
17 <PlatformTarget>x86</PlatformTarget>
18 <ConsolePause>false</ConsolePause>
19 </PropertyGroup>
20+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
21+ <DebugSymbols>true</DebugSymbols>
22+ <OutputPath>bin\Debug\</OutputPath>
23+ <DefineConstants>DEBUG</DefineConstants>
24+ <DocumentationFile>bin\Debug\Canonical.UbuntuOne.Client.XML</DocumentationFile>
25+ <DebugType>full</DebugType>
26+ <PlatformTarget>AnyCPU</PlatformTarget>
27+ <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
28+ <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
29+ <ErrorReport>prompt</ErrorReport>
30+ </PropertyGroup>
31+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
32+ <OutputPath>bin\Release\</OutputPath>
33+ <PlatformTarget>AnyCPU</PlatformTarget>
34+ <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
35+ <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
36+ <ErrorReport>prompt</ErrorReport>
37+ </PropertyGroup>
38 <ItemGroup>
39 <Compile Include="..\Version.cs">
40 <Link>Properties\Version.cs</Link>
41
42=== modified file 'src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj'
43--- src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj 2010-08-20 08:32:22 +0000
44+++ src/Canonical.UbuntuOne.Common.Tests/Canonical.UbuntuOne.Common.Tests.csproj 2010-10-06 13:18:01 +0000
45@@ -33,6 +33,23 @@
46 <PlatformTarget>x86</PlatformTarget>
47 <ConsolePause>false</ConsolePause>
48 </PropertyGroup>
49+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
50+ <DebugSymbols>true</DebugSymbols>
51+ <OutputPath>bin\Debug\</OutputPath>
52+ <DefineConstants>DEBUG</DefineConstants>
53+ <DebugType>full</DebugType>
54+ <PlatformTarget>AnyCPU</PlatformTarget>
55+ <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
56+ <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
57+ <ErrorReport>prompt</ErrorReport>
58+ </PropertyGroup>
59+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
60+ <OutputPath>bin\Release\</OutputPath>
61+ <PlatformTarget>AnyCPU</PlatformTarget>
62+ <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
63+ <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
64+ <ErrorReport>prompt</ErrorReport>
65+ </PropertyGroup>
66 <ItemGroup>
67 <Compile Include="..\Version.cs">
68 <Link>Properties\Version.cs</Link>
69
70=== modified file 'src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj'
71--- src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj 2010-10-06 13:18:01 +0000
72+++ src/Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common.csproj 2010-10-06 13:18:01 +0000
73@@ -32,6 +32,24 @@
74 <PlatformTarget>x86</PlatformTarget>
75 <ConsolePause>false</ConsolePause>
76 </PropertyGroup>
77+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
78+ <DebugSymbols>true</DebugSymbols>
79+ <OutputPath>bin\Debug\</OutputPath>
80+ <DefineConstants>DEBUG</DefineConstants>
81+ <DocumentationFile>bin\Debug\Canonical.UbuntuOne.Common.XML</DocumentationFile>
82+ <DebugType>full</DebugType>
83+ <PlatformTarget>AnyCPU</PlatformTarget>
84+ <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
85+ <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
86+ <ErrorReport>prompt</ErrorReport>
87+ </PropertyGroup>
88+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
89+ <OutputPath>bin\Release\</OutputPath>
90+ <PlatformTarget>AnyCPU</PlatformTarget>
91+ <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
92+ <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
93+ <ErrorReport>prompt</ErrorReport>
94+ </PropertyGroup>
95 <ItemGroup>
96 <Compile Include="..\Version.cs">
97 <Link>Properties\Version.cs</Link>
98
99=== modified file 'src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Canonical.UbuntuOne.ProcessDispatcher.Tests.csproj'
100--- src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Canonical.UbuntuOne.ProcessDispatcher.Tests.csproj 2010-08-24 16:09:12 +0000
101+++ src/Canonical.UbuntuOne.ProcessDispatcher.Tests/Canonical.UbuntuOne.ProcessDispatcher.Tests.csproj 2010-10-06 13:18:01 +0000
102@@ -51,6 +51,23 @@
103 <PlatformTarget>x86</PlatformTarget>
104 <ConsolePause>false</ConsolePause>
105 </PropertyGroup>
106+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
107+ <DebugSymbols>true</DebugSymbols>
108+ <OutputPath>bin\Debug\</OutputPath>
109+ <DefineConstants>DEBUG</DefineConstants>
110+ <DebugType>full</DebugType>
111+ <PlatformTarget>AnyCPU</PlatformTarget>
112+ <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
113+ <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
114+ <ErrorReport>prompt</ErrorReport>
115+ </PropertyGroup>
116+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
117+ <OutputPath>bin\Release\</OutputPath>
118+ <PlatformTarget>AnyCPU</PlatformTarget>
119+ <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
120+ <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
121+ <ErrorReport>prompt</ErrorReport>
122+ </PropertyGroup>
123 <ItemGroup>
124 <Compile Include="..\Version.cs">
125 <Link>Properties\Version.cs</Link>
126
127=== modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj'
128--- src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj 2010-08-24 16:09:12 +0000
129+++ src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj 2010-10-06 13:18:01 +0000
130@@ -52,6 +52,24 @@
131 <PlatformTarget>x86</PlatformTarget>
132 <ConsolePause>false</ConsolePause>
133 </PropertyGroup>
134+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
135+ <DebugSymbols>true</DebugSymbols>
136+ <OutputPath>bin\Debug\</OutputPath>
137+ <DefineConstants>DEBUG</DefineConstants>
138+ <DocumentationFile>bin\Debug\Canonical.UbuntuOne.ProcessDispatcher.XML</DocumentationFile>
139+ <DebugType>full</DebugType>
140+ <PlatformTarget>AnyCPU</PlatformTarget>
141+ <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
142+ <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
143+ <ErrorReport>prompt</ErrorReport>
144+ </PropertyGroup>
145+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
146+ <OutputPath>bin\Release\</OutputPath>
147+ <PlatformTarget>AnyCPU</PlatformTarget>
148+ <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
149+ <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
150+ <ErrorReport>prompt</ErrorReport>
151+ </PropertyGroup>
152 <ItemGroup>
153 <None Include="App.config" />
154 <None Include="Config\log4net.config">
155
156=== modified file 'src/UbuntuOne.sln'
157--- src/UbuntuOne.sln 2010-10-06 13:18:01 +0000
158+++ src/UbuntuOne.sln 2010-10-06 13:18:01 +0000
159@@ -39,7 +39,8 @@
160 Release|x86 = Release|x86
161 EndGlobalSection
162 GlobalSection(ProjectConfigurationPlatforms) = postSolution
163- {7467483A-D6D5-4362-8DF4-57A7254EB569}.Debug|Any CPU.ActiveCfg = Debug|x86
164+ {7467483A-D6D5-4362-8DF4-57A7254EB569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
165+ {7467483A-D6D5-4362-8DF4-57A7254EB569}.Debug|Any CPU.Build.0 = Debug|Any CPU
166 {7467483A-D6D5-4362-8DF4-57A7254EB569}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
167 {7467483A-D6D5-4362-8DF4-57A7254EB569}.Debug|Mixed Platforms.Build.0 = Debug|x86
168 {7467483A-D6D5-4362-8DF4-57A7254EB569}.Debug|x86.ActiveCfg = Debug|x86
169@@ -49,7 +50,8 @@
170 {7467483A-D6D5-4362-8DF4-57A7254EB569}.Release|Mixed Platforms.Build.0 = Release|x86
171 {7467483A-D6D5-4362-8DF4-57A7254EB569}.Release|x86.ActiveCfg = Release|x86
172 {7467483A-D6D5-4362-8DF4-57A7254EB569}.Release|x86.Build.0 = Release|x86
173- {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Debug|Any CPU.ActiveCfg = Debug|x86
174+ {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
175+ {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
176 {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
177 {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Debug|Mixed Platforms.Build.0 = Debug|x86
178 {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Debug|x86.ActiveCfg = Debug|x86
179@@ -59,7 +61,8 @@
180 {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Release|Mixed Platforms.Build.0 = Release|x86
181 {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Release|x86.ActiveCfg = Release|x86
182 {11353FF8-8E5A-488E-9CB1-873DADD232B9}.Release|x86.Build.0 = Release|x86
183- {9F0C15EE-6132-4431-8924-D65530F52CCE}.Debug|Any CPU.ActiveCfg = Debug|x86
184+ {9F0C15EE-6132-4431-8924-D65530F52CCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
185+ {9F0C15EE-6132-4431-8924-D65530F52CCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
186 {9F0C15EE-6132-4431-8924-D65530F52CCE}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
187 {9F0C15EE-6132-4431-8924-D65530F52CCE}.Debug|Mixed Platforms.Build.0 = Debug|x86
188 {9F0C15EE-6132-4431-8924-D65530F52CCE}.Debug|x86.ActiveCfg = Debug|x86
189@@ -69,7 +72,8 @@
190 {9F0C15EE-6132-4431-8924-D65530F52CCE}.Release|Mixed Platforms.Build.0 = Release|x86
191 {9F0C15EE-6132-4431-8924-D65530F52CCE}.Release|x86.ActiveCfg = Release|x86
192 {9F0C15EE-6132-4431-8924-D65530F52CCE}.Release|x86.Build.0 = Release|x86
193- {8D353509-C095-4E72-A693-3CEE97704C7D}.Debug|Any CPU.ActiveCfg = Debug|x86
194+ {8D353509-C095-4E72-A693-3CEE97704C7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
195+ {8D353509-C095-4E72-A693-3CEE97704C7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
196 {8D353509-C095-4E72-A693-3CEE97704C7D}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
197 {8D353509-C095-4E72-A693-3CEE97704C7D}.Debug|Mixed Platforms.Build.0 = Debug|x86
198 {8D353509-C095-4E72-A693-3CEE97704C7D}.Debug|x86.ActiveCfg = Debug|x86
199@@ -79,7 +83,8 @@
200 {8D353509-C095-4E72-A693-3CEE97704C7D}.Release|Mixed Platforms.Build.0 = Release|x86
201 {8D353509-C095-4E72-A693-3CEE97704C7D}.Release|x86.ActiveCfg = Release|x86
202 {8D353509-C095-4E72-A693-3CEE97704C7D}.Release|x86.Build.0 = Release|x86
203- {6C139C0B-FDBB-4DA3-9308-0E57531A085F}.Debug|Any CPU.ActiveCfg = Debug|x86
204+ {6C139C0B-FDBB-4DA3-9308-0E57531A085F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
205+ {6C139C0B-FDBB-4DA3-9308-0E57531A085F}.Debug|Any CPU.Build.0 = Debug|Any CPU
206 {6C139C0B-FDBB-4DA3-9308-0E57531A085F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
207 {6C139C0B-FDBB-4DA3-9308-0E57531A085F}.Debug|Mixed Platforms.Build.0 = Debug|x86
208 {6C139C0B-FDBB-4DA3-9308-0E57531A085F}.Debug|x86.ActiveCfg = Debug|x86

Subscribers

People subscribed via source and target branches

to all changes: