Permalink
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...
jlaanstra committed Mar 20, 2013
1 parent 2affdbb commit 2823f2b403992fcea4470a82dbbce82fd9e9038a
@@ -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">
@@ -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">
@@ -91,6 +91,10 @@
<Project>{1ce2d235-8072-4649-ba5a-cfb1af8776e0}</Project>
<Name>ReactiveUI.Xaml_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" />
@@ -96,6 +96,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>
<ProjectExtensions />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" />
@@ -110,6 +110,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 />
@@ -100,6 +100,12 @@
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
+ <ItemGroup>
+ <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" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
@@ -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>
@@ -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")]
@@ -58,6 +58,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>
@@ -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
@@ -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
@@ -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 2823f2b

Please sign in to comment.