Browse files

Fixed compile errors.

Fixed InternalsVisibleTo.
Temporarily handle unit test detection by returning false.
Change the namespace for PropertyChanging classes to work around namespace collision on .Net45. Need to think about the best way to handle this.
  • Loading branch information...
1 parent 82fc6c8 commit c5acf5b395d864bdbbd72f683fd87ea097f286a3 @jlaanstra jlaanstra committed with paulcbetts Mar 20, 2013
View
4 MobileSample-WP8/MobileSample-WP8.csproj
@@ -177,6 +177,10 @@
<Project>{F9459904-F785-4255-866A-A619787CB895}</Project>
<Name>ReactiveUI.Xaml_WP8</Name>
</ProjectReference>
+ <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
+ <Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
+ <Name>ReactiveUI</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.Threading.Tasks">
View
4 MobileSample-WinRT/MobileSample-WinRT.csproj
@@ -188,6 +188,10 @@
<Project>{689ec7c5-2d81-4124-929e-397b330cc358}</Project>
<Name>ReactiveUI.Xaml_WinRT</Name>
</ProjectReference>
+ <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
+ <Project>{464cb812-f99f-401b-be4c-e8f0515cd19d}</Project>
+ <Name>ReactiveUI</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json">
View
7 ReactiveUI.Blend/ReactiveUI.Blend_Net45.csproj
@@ -91,6 +91,13 @@
<Project>{292a477b-bb94-43c1-984e-e177ef9fedb7}</Project>
<Name>ReactiveUI_Net45</Name>
</ProjectReference>
+ <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
+ <Project>{464cb812-f99f-401b-be4c-e8f0515cd19d}</Project>
+ <Name>ReactiveUI</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
View
4 ReactiveUI.Blend/ReactiveUI.Blend_WP8.csproj
@@ -103,6 +103,10 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
+ <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
+ <Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
+ <Name>ReactiveUI</Name>
+ </ProjectReference>
</ItemGroup>
<ProjectExtensions />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" />
View
6 ReactiveUI.NLog/ReactiveUI.NLog_WP8.csproj
@@ -116,6 +116,12 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ServiceLocationRegistration.cs" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
+ <Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
+ <Name>ReactiveUI</Name>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
<ProjectExtensions />
View
3 ReactiveUI.Testing/ReactiveUI.Testing_WP8.csproj
@@ -122,6 +122,9 @@
<ProjectReference Include="..\ReactiveUI\ReactiveUI_WP8.csproj">
<Project>{FAEA4F2E-017C-47AF-B467-4D2C7210CDEF}</Project>
<Name>ReactiveUI_WP8</Name>
+ <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
+ <Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
+ <Name>ReactiveUI</Name>
</ProjectReference>
</ItemGroup>
<ProjectExtensions />
View
2 ReactiveUI.Tests/ReactiveUI.Tests_Net45.csproj
@@ -10,7 +10,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ReactiveUI.Tests</RootNamespace>
- <AssemblyName>ReactiveUI.Tests</AssemblyName>
+ <AssemblyName>ReactiveUI.Tests_Net45</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
View
3 ReactiveUI.Xaml/Properties/AssemblyInfo.cs
@@ -18,7 +18,6 @@
)]
#endif
-[assembly: InternalsVisibleTo("ReactiveUI.Tests")]
-[assembly: InternalsVisibleTo("ReactiveUI.Tests_SL4")]
+[assembly: InternalsVisibleTo("ReactiveUI.Tests_Net45")]
[assembly: InternalsVisibleTo("ReactiveUI.Tests_SL5")]
[assembly: InternalsVisibleTo("ReactiveUI.Tests_WinRT")]
View
1 ReactiveUI.Xaml/ReactiveUI.Xaml_SL5.csproj
@@ -56,6 +56,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib" />
+ <Reference Include="System.ComponentModel.DataAnnotations, Version=5.0.5.0, Culture=neutral, PublicKeyToken=ddd0da4d3e678217, processorArchitecture=MSIL" />
<Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\ext\SL5\System.Reactive.Core.dll</HintPath>
View
4 ReactiveUI/ContractStubs.cs
@@ -19,7 +19,7 @@ internal class Contract
#if IOS || WINRT || PORTABLE
-namespace System.ComponentModel
+namespace ReactiveUI
{
public class PropertyChangingEventArgs : EventArgs
{
@@ -44,7 +44,7 @@ public interface INotifyPropertyChanging
#endif
#if SILVERLIGHT || WINRT || PORTABLE
-namespace System
+namespace ReactiveUI
{
[AttributeUsage(AttributeTargets.All, Inherited = false, AllowMultiple = true)]
public sealed class LocalizableAttribute : Attribute
View
11 ReactiveUI/Properties/AssemblyInfo.cs
@@ -7,29 +7,26 @@
[assembly: AssemblyVersion("4.5.0")]
[assembly: InternalsVisibleTo("ReactiveUI.Explorables")]
-[assembly: InternalsVisibleTo("ReactiveUI.Xaml")]
+[assembly: InternalsVisibleTo("ReactiveUI.Xaml_Net40")]
[assembly: InternalsVisibleTo("ReactiveUI.Xaml_Net45")]
-[assembly: InternalsVisibleTo("ReactiveUI.Xaml_35")]
-[assembly: InternalsVisibleTo("ReactiveUI.Xaml_SL4")]
[assembly: InternalsVisibleTo("ReactiveUI.Xaml_SL5")]
[assembly: InternalsVisibleTo("ReactiveUI.Xaml_WinRT")]
[assembly: InternalsVisibleTo("ReactiveUI.Xaml_WP7")]
[assembly: InternalsVisibleTo("ReactiveUI.Xaml_WP8")]
[assembly: InternalsVisibleTo("ReactiveUI.Xaml_Monotouch")]
[assembly: InternalsVisibleTo("ReactiveUI.Xaml_Monodroid")]
-[assembly: InternalsVisibleTo("ReactiveUI.Tests")]
-[assembly: InternalsVisibleTo("ReactiveUI.Tests_SL4")]
+[assembly: InternalsVisibleTo("ReactiveUI.Tests_Net45")]
[assembly: InternalsVisibleTo("ReactiveUI.Tests_SL5")]
[assembly: InternalsVisibleTo("ReactiveUI.Tests_WinRT")]
-[assembly: InternalsVisibleTo("ReactiveUI.Routing")]
+[assembly: InternalsVisibleTo("ReactiveUI.Routing_Net40")]
[assembly: InternalsVisibleTo("ReactiveUI.Routing_Net45")]
[assembly: InternalsVisibleTo("ReactiveUI.Routing_SL5")]
[assembly: InternalsVisibleTo("ReactiveUI.Routing_WP7")]
[assembly: InternalsVisibleTo("ReactiveUI.Routing_WP8")]
[assembly: InternalsVisibleTo("ReactiveUI.Routing_WinRT")]
[assembly: InternalsVisibleTo("ReactiveUI.Routing_Monotouch")]
[assembly: InternalsVisibleTo("ReactiveUI.Routing_Monodroid")]
-[assembly: InternalsVisibleTo("ReactiveUI.NLog")]
+[assembly: InternalsVisibleTo("ReactiveUI.NLog_Net40")]
[assembly: InternalsVisibleTo("ReactiveUI.NLog_Net45")]
[assembly: InternalsVisibleTo("ReactiveUI.NLog_SL5")]
[assembly: InternalsVisibleTo("ReactiveUI.NLog_WP7")]
View
3 ReactiveUI/RxApp.cs
@@ -472,6 +472,9 @@ public static bool InUnitTestRunner(string[] testAssemblies, string[] designEnvi
}, TaskCreationOptions.HideScheduler).Unwrap();
return fileTask.Result.Any(x => testAssemblies.Any(name => x.ToUpperInvariant().Contains(name)));
+#elif PORTABLE
+ //Figure out portable way to do this.
+ return false;
#else
// Try to detect whether we're in design mode - bonus points,
// without access to any WPF references :-/

0 comments on commit c5acf5b

Please sign in to comment.