Skip to content

Commit c41f9fd

Browse files
anaisbettsanaisbetts
committed
Verbatim backport all of RxUI.Events 6.0 to 5.0 so we can build Win8.0
1 parent 9cada98 commit c41f9fd

22 files changed

+42
-44
lines changed

‎ReactiveUI.Events/EventBuilder.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,12 @@ public AssemblyDefinition Resolve(string fullName, ReaderParameters parameters)
307307
fullPath = targetAssemblyDirs.Select(x => Path.Combine(x, dllName)).FirstOrDefault(x => File.Exists(x));
308308
}
309309

310+
// NB: This hacks WinRT's weird mscorlib to just use the regular one
311+
if (fullName.Contains("mscorlib") && fullName.Contains("255"))
312+
{
313+
fullPath = Environment.ExpandEnvironmentVariables(@"%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\mscorlib.dll");
314+
}
315+
310316
if (fullPath == null)
311317
{
312318
var err = String.Format("Failed to resolve!!! {0}", fullName);
@@ -328,6 +334,12 @@ public AssemblyDefinition Resolve(string fullName)
328334
fullPath = targetAssemblyDirs.Select(x => Path.Combine(x, dllName)).FirstOrDefault(x => File.Exists(x));
329335
}
330336

337+
// NB: This hacks WinRT's weird mscorlib to just use the regular one
338+
if (fullName.Contains("mscorlib") && fullName.Contains("255"))
339+
{
340+
fullPath = Environment.ExpandEnvironmentVariables(@"%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\mscorlib.dll");
341+
}
342+
331343
if (fullPath == null)
332344
{
333345
var err = String.Format("Failed to resolve!!! {0}", fullName);

‎ReactiveUI.Events/ReactiveUI.Events_Monodroid.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<DebugType>full</DebugType>
2424
<Optimize>false</Optimize>
2525
<OutputPath>bin\Debug\Monoandroid\</OutputPath>
26+
<IntermediateOutputPath>obj\Debug\Monoandroid</IntermediateOutputPath>
2627
<DefineConstants>DEBUG;TRACE</DefineConstants>
2728
<ErrorReport>prompt</ErrorReport>
2829
<WarningLevel>4</WarningLevel>
@@ -31,6 +32,7 @@
3132
<DebugType>pdbonly</DebugType>
3233
<Optimize>true</Optimize>
3334
<OutputPath>bin\Release\Monoandroid\</OutputPath>
35+
<IntermediateOutputPath>obj\Release\Monoandroid</IntermediateOutputPath>
3436
<DefineConstants>TRACE</DefineConstants>
3537
<ErrorReport>prompt</ErrorReport>
3638
<WarningLevel>4</WarningLevel>

‎ReactiveUI.Events/ReactiveUI.Events_Monomac.csproj

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,7 @@
130130
<Reference Include="Microsoft.CSharp" />
131131
<Reference Include="System.ComponentModel.DataAnnotations" />
132132
<Reference Include="System.Drawing" />
133-
<Reference Include="XamMac, Version=0.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065">
134-
<Private>False</Private>
135-
</Reference>
133+
<Reference Include="XamMac, Version=0.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065" />
136134
<Reference Include="System.Reactive.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
137135
<HintPath>..\ext\mono\System.Reactive.Core.dll</HintPath>
138136
</Reference>
@@ -145,21 +143,11 @@
145143
<Reference Include="System.Reactive.PlatformServices, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
146144
<HintPath>..\ext\mono\System.Reactive.PlatformServices.dll</HintPath>
147145
</Reference>
148-
<Reference Include="System.Reactive.Core, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
149-
<Private>False</Private>
150-
</Reference>
151-
<Reference Include="System.Reactive.Interfaces, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
152-
<Private>False</Private>
153-
</Reference>
154-
<Reference Include="System.Reactive.Linq, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
155-
<Private>False</Private>
156-
</Reference>
157-
<Reference Include="System.Reactive.PlatformServices, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
158-
<Private>False</Private>
159-
</Reference>
160-
<Reference Include="System.Reactive.Debugger, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
161-
<Private>False</Private>
162-
</Reference>
146+
<Reference Include="System.Reactive.Core, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
147+
<Reference Include="System.Reactive.Interfaces, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
148+
<Reference Include="System.Reactive.Linq, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
149+
<Reference Include="System.Reactive.PlatformServices, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
150+
<Reference Include="System.Reactive.Debugger, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
163151
<Reference Include="XamMac" />
164152
</ItemGroup>
165153
<ItemGroup>

‎ReactiveUI.Events/ReactiveUI.Events_Monotouch.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<DebugType>full</DebugType>
2020
<Optimize>false</Optimize>
2121
<OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
22+
<IntermediateOutputPath>obj\iPhoneSimulator\Debug</IntermediateOutputPath>
2223
<DefineConstants>DEBUG</DefineConstants>
2324
<ErrorReport>prompt</ErrorReport>
2425
<WarningLevel>4</WarningLevel>
@@ -30,6 +31,7 @@
3031
<DebugType>none</DebugType>
3132
<Optimize>true</Optimize>
3233
<OutputPath>bin\iPhoneSimulator\Release</OutputPath>
34+
<IntermediateOutputPath>obj\iPhoneSimulator\Release</IntermediateOutputPath>
3335
<ErrorReport>prompt</ErrorReport>
3436
<WarningLevel>4</WarningLevel>
3537
<ConsolePause>false</ConsolePause>
@@ -40,6 +42,7 @@
4042
<DebugType>full</DebugType>
4143
<Optimize>false</Optimize>
4244
<OutputPath>bin\Debug\Monotouch\</OutputPath>
45+
<IntermediateOutputPath>obj\Debug\Monotouch</IntermediateOutputPath>
4346
<DefineConstants>DEBUG</DefineConstants>
4447
<ErrorReport>prompt</ErrorReport>
4548
<WarningLevel>4</WarningLevel>
@@ -51,6 +54,7 @@
5154
<DebugType>pdbonly</DebugType>
5255
<Optimize>true</Optimize>
5356
<OutputPath>bin\Release\Monotouch\</OutputPath>
57+
<IntermediateOutputPath>obj\Release\Monotouch</IntermediateOutputPath>
5458
<ErrorReport>prompt</ErrorReport>
5559
<WarningLevel>4</WarningLevel>
5660
<ConsolePause>false</ConsolePause>
@@ -61,6 +65,7 @@
6165
<DebugType>none</DebugType>
6266
<Optimize>True</Optimize>
6367
<OutputPath>bin\iPhone\Ad-Hoc</OutputPath>
68+
<IntermediateOutputPath>obj\iPhone\Ad-Hoc</IntermediateOutputPath>
6469
<ErrorReport>prompt</ErrorReport>
6570
<WarningLevel>4</WarningLevel>
6671
<ConsolePause>False</ConsolePause>
@@ -71,6 +76,7 @@
7176
<DebugType>none</DebugType>
7277
<Optimize>True</Optimize>
7378
<OutputPath>bin\iPhone\AppStore</OutputPath>
79+
<IntermediateOutputPath>obj\iPhone\AppStore</IntermediateOutputPath>
7480
<ErrorReport>prompt</ErrorReport>
7581
<WarningLevel>4</WarningLevel>
7682
<ConsolePause>False</ConsolePause>

‎ReactiveUI.Events/ReactiveUI.Events_Net45.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<DebugType>full</DebugType>
2222
<Optimize>false</Optimize>
2323
<OutputPath>bin\Debug\Net45\</OutputPath>
24+
<IntermediateOutputPath>obj\Debug\Net45</IntermediateOutputPath>
2425
<DefineConstants>DEBUG;TRACE</DefineConstants>
2526
<ErrorReport>prompt</ErrorReport>
2627
<WarningLevel>4</WarningLevel>
@@ -29,6 +30,7 @@
2930
<DebugType>pdbonly</DebugType>
3031
<Optimize>true</Optimize>
3132
<OutputPath>bin\Release\Net45\</OutputPath>
33+
<IntermediateOutputPath>obj\Release\Net45</IntermediateOutputPath>
3234
<DefineConstants>TRACE</DefineConstants>
3335
<ErrorReport>prompt</ErrorReport>
3436
<WarningLevel>4</WarningLevel>

‎ReactiveUI.Events/ReactiveUI.Events_WP8.csproj

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<DebugType>full</DebugType>
2626
<Optimize>false</Optimize>
2727
<OutputPath>Bin\Debug\WP8\</OutputPath>
28+
<IntermediateOutputPath>obj\Debug\WP8</IntermediateOutputPath>
2829
<DefineConstants>DEBUG;TRACE;SILVERLIGHT;WP8</DefineConstants>
2930
<NoStdLib>true</NoStdLib>
3031
<NoConfig>true</NoConfig>
@@ -58,6 +59,7 @@
5859
<DebugType>pdbonly</DebugType>
5960
<Optimize>true</Optimize>
6061
<OutputPath>Bin\Release\WP8\</OutputPath>
62+
<IntermediateOutputPath>obj\Release\WP8</IntermediateOutputPath>
6163
<DefineConstants>TRACE;SILVERLIGHT;WP8</DefineConstants>
6264
<NoStdLib>true</NoStdLib>
6365
<NoConfig>true</NoConfig>
@@ -70,6 +72,7 @@
7072
<DebugType>full</DebugType>
7173
<Optimize>false</Optimize>
7274
<OutputPath>Bin\x86\Debug\WP8\</OutputPath>
75+
<IntermediateOutputPath>obj\x86\Debug\WP8</IntermediateOutputPath>
7376
<DefineConstants>DEBUG;TRACE;SILVERLIGHT;WP8</DefineConstants>
7477
<NoStdLib>true</NoStdLib>
7578
<NoConfig>true</NoConfig>
@@ -80,6 +83,7 @@
8083
<DebugType>pdbonly</DebugType>
8184
<Optimize>true</Optimize>
8285
<OutputPath>Bin\x86\Release\WP8\</OutputPath>
86+
<IntermediateOutputPath>obj\x86\Release\WP8</IntermediateOutputPath>
8387
<DefineConstants>TRACE;SILVERLIGHT;WP8</DefineConstants>
8488
<NoStdLib>true</NoStdLib>
8589
<NoConfig>true</NoConfig>
@@ -91,6 +95,7 @@
9195
<DebugType>full</DebugType>
9296
<Optimize>false</Optimize>
9397
<OutputPath>Bin\ARM\Debug\WP8\</OutputPath>
98+
<IntermediateOutputPath>obj\ARM\Debug\WP8</IntermediateOutputPath>
9499
<DefineConstants>DEBUG;TRACE;SILVERLIGHT;WP8</DefineConstants>
95100
<NoStdLib>true</NoStdLib>
96101
<NoConfig>true</NoConfig>
@@ -101,6 +106,7 @@
101106
<DebugType>pdbonly</DebugType>
102107
<Optimize>true</Optimize>
103108
<OutputPath>Bin\ARM\Release\WP8\</OutputPath>
109+
<IntermediateOutputPath>obj\ARM\Release\WP8</IntermediateOutputPath>
104110
<DefineConstants>TRACE;SILVERLIGHT;WP8</DefineConstants>
105111
<NoStdLib>true</NoStdLib>
106112
<NoConfig>true</NoConfig>
@@ -110,25 +116,6 @@
110116
<ItemGroup>
111117
<Reference Include="mscorlib.Extensions" />
112118
<Reference Include="System.Observable" />
113-
<Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
114-
<SpecificVersion>False</SpecificVersion>
115-
<HintPath>..\ext\WP80\System.Reactive.Core.dll</HintPath>
116-
</Reference>
117-
<Reference Include="System.Reactive.Interfaces, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
118-
<SpecificVersion>False</SpecificVersion>
119-
<HintPath>..\ext\WP80\System.Reactive.Interfaces.dll</HintPath>
120-
</Reference>
121-
<Reference Include="System.Reactive.Linq, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
122-
<SpecificVersion>False</SpecificVersion>
123-
<HintPath>..\ext\WP80\System.Reactive.Linq.dll</HintPath>
124-
</Reference>
125-
<Reference Include="System.Reactive.PlatformServices, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
126-
<SpecificVersion>False</SpecificVersion>
127-
<HintPath>..\ext\WP80\System.Reactive.PlatformServices.dll</HintPath>
128-
</Reference>
129-
<Reference Include="System.Reactive.Windows.Threading">
130-
<SpecificVersion>False</SpecificVersion>
131-
</Reference>
132119
<Reference Include="System.Reactive.Core">
133120
<HintPath>..\ext\WP80\System.Reactive.Core.dll</HintPath>
134121
</Reference>

‎ReactiveUI.Events/ReactiveUI.Events_WinRT.csproj

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
77
<ProductVersion>8.0.30703</ProductVersion>
88
<SchemaVersion>2.0</SchemaVersion>
9-
<ProjectGuid>{689EC7CA-2D81-4124-929E-397B330CC358}</ProjectGuid>
9+
<ProjectGuid>{38293C8C-061C-4D69-8247-2693673141FD}</ProjectGuid>
1010
<OutputType>Library</OutputType>
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
1212
<RootNamespace>ReactiveUI.Events</RootNamespace>
@@ -22,6 +22,7 @@
2222
<DebugType>full</DebugType>
2323
<Optimize>false</Optimize>
2424
<OutputPath>bin\Debug\WinRT45\</OutputPath>
25+
<IntermediateOutputPath>obj\Debug\WinRT45</IntermediateOutputPath>
2526
<DefineConstants>TRACE;DEBUG;WINRT</DefineConstants>
2627
<ErrorReport>prompt</ErrorReport>
2728
<WarningLevel>4</WarningLevel>
@@ -30,16 +31,17 @@
3031
<DebugType>pdbonly</DebugType>
3132
<Optimize>true</Optimize>
3233
<OutputPath>bin\Release\WinRT45\</OutputPath>
34+
<IntermediateOutputPath>obj\Release\WinRT45</IntermediateOutputPath>
3335
<DefineConstants>TRACE;WINRT</DefineConstants>
3436
<ErrorReport>prompt</ErrorReport>
35-
<WarningLevel>4</WarningLevel>
37+
<WarningLevel>3</WarningLevel>
3638
<DocumentationFile>bin\Release\WinRT45\ReactiveUI.Events.xml</DocumentationFile>
3739
</PropertyGroup>
3840
<ItemGroup>
3941
<Compile Include="..\CommonAssemblyInfo.cs">
4042
<Link>Properties\CommonAssemblyInfo.cs</Link>
4143
</Compile>
42-
<Compile Include="Events_WinRT.cs" />
44+
<Compile Include="Events_WinRT80.cs" />
4345
<Compile Include="Properties\AssemblyInfo.cs" />
4446
</ItemGroup>
4547
<ItemGroup>
@@ -71,20 +73,19 @@
7173
<Name>ReactiveUI</Name>
7274
</ProjectReference>
7375
</ItemGroup>
74-
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' ">
76+
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
7577
<VisualStudioVersion>11.0</VisualStudioVersion>
7678
</PropertyGroup>
7779
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
7880
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
7981
<PropertyGroup>
8082
<PreBuildEvent>%25SystemRoot%25\Microsoft.NET\Framework\v4.0.30319\msbuild.exe /p:Configuration=Release "$(ProjectDir)EventBuilder.csproj"
81-
"$(ProjectDir)EventBuilder.exe" "$(ProjectDir)\WinMetadata.Win80\Windows.Foundation.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Globalization.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Graphics.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Management.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Media.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Networking.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Security.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Storage.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.System.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.UI.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.UI.Xaml.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Web.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.ApplicationModel.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Data.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Devices.winmd" "$(ProjectDir)Events.mustache" &gt; "$(ProjectDir)Events_WinRT.cs"
83+
"$(ProjectDir)EventBuilder.exe" "$(ProjectDir)\WinMetadata.Win80\Windows.Foundation.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Globalization.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Graphics.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Management.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Media.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Networking.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Security.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Storage.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.System.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.UI.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.UI.Xaml.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Web.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.ApplicationModel.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Data.winmd" "$(ProjectDir)\WinMetadata.Win80\Windows.Devices.winmd" "$(ProjectDir)Events.mustache" &gt; "$(ProjectDir)Events_WinRT80.cs"
8284
del "$(ProjectDir)EventBuilder.exe"
8385
del "$(ProjectDir)EventBuilder.pdb"
8486
del "$(ProjectDir)Nustache.Core.dll"
8587
del "$(ProjectDir)Mono.Cecil.dll"
86-
del "$(ProjectDir)Mono.Cecil.pdb"
87-
</PreBuildEvent>
88+
del "$(ProjectDir)Mono.Cecil.pdb"</PreBuildEvent>
8889
</PropertyGroup>
8990
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
9091
Other similar extension points exist, see Microsoft.Common.targets.

‎ReactiveUI.Events/WinMetadata.Win81/Windows.ApplicationModel.winmd

131 KB
Binary file not shown.

‎ReactiveUI.Events/WinMetadata.Win81/Windows.Data.winmd

49 KB
Binary file not shown.

‎ReactiveUI.Events/WinMetadata.Win81/Windows.Devices.winmd

166 KB
Binary file not shown.

‎ReactiveUI.Events/WinMetadata.Win81/Windows.Foundation.winmd

29.5 KB
Binary file not shown.

‎ReactiveUI.Events/WinMetadata.Win81/Windows.Globalization.winmd

53.5 KB
Binary file not shown.

‎ReactiveUI.Events/WinMetadata.Win81/Windows.Graphics.winmd

48.5 KB
Binary file not shown.

‎ReactiveUI.Events/WinMetadata.Win81/Windows.Management.winmd

8.5 KB
Binary file not shown.

‎ReactiveUI.Events/WinMetadata.Win81/Windows.Media.winmd

119 KB
Binary file not shown.

‎ReactiveUI.Events/WinMetadata.Win81/Windows.Networking.winmd

110 KB
Binary file not shown.

‎ReactiveUI.Events/WinMetadata.Win81/Windows.Security.winmd

65 KB
Binary file not shown.

‎ReactiveUI.Events/WinMetadata.Win81/Windows.Storage.winmd

94 KB
Binary file not shown.

‎ReactiveUI.Events/WinMetadata.Win81/Windows.System.winmd

20 KB
Binary file not shown.

‎ReactiveUI.Events/WinMetadata.Win81/Windows.UI.Xaml.winmd

774 KB
Binary file not shown.

‎ReactiveUI.Events/WinMetadata.Win81/Windows.UI.winmd

171 KB
Binary file not shown.

‎ReactiveUI.Events/WinMetadata.Win81/Windows.Web.winmd

91.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)