Permalink
Browse files

Move UWP project back into main folder

  • Loading branch information...
1 parent d3e9174 commit ed2dc5b5c879f457a00b4bd0fe8eb57b7282a279 @nigel-sampson nigel-sampson committed Feb 10, 2016
View
@@ -42,5 +42,6 @@ nuget/*/lib/
*.vs10x
*.docstates
packages/
+*.project.lock.json
project.lock.json
.vs
@@ -1,7 +1,7 @@
{
"dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0",
- "Microsoft.Xaml.Behaviors.Uwp.Managed": "1.0.0"
+ "Microsoft.Xaml.Behaviors.Uwp.Managed": "1.0.3"
},
"frameworks": {
"uap10.0": {}
@@ -1,6 +0,0 @@
-# Why the separate folder?
-
-Currently nuget v3 doesn't support multiple projects in the same folder because they all try to use project.json.
-This is much like packages.config but it doesn't yet support the feature to prefix the file with the project name.
-
-Until we'll keep the project in a separate folder.
@@ -7,7 +7,7 @@
<ProjectGuid>{94D9A9C6-44C1-4E5A-877B-5761C963B2F6}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Caliburn.Micro.Platform.UWP</RootNamespace>
+ <RootNamespace>Caliburn.Micro</RootNamespace>
<AssemblyName>Caliburn.Micro.Platform.UWP</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
@@ -114,126 +114,6 @@
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
- <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
- <None Include="project.json" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="..\Caliburn.Micro.Platform\Action.cs">
- <Link>Action.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\ActionExecutionContext.cs">
- <Link>ActionExecutionContext.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\ActionMessage.cs">
- <Link>ActionMessage.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\Bind.cs">
- <Link>Bind.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\BindingScope.cs">
- <Link>BindingScope.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\BooleanToVisibilityConverter.cs">
- <Link>BooleanToVisibilityConverter.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\ChildResolver.cs">
- <Link>ChildResolver.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\ConventionManager.cs">
- <Link>ConventionManager.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\DependencyPropertyHelper.cs">
- <Link>DependencyPropertyHelper.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\ElementConvention.cs">
- <Link>ElementConvention.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\IHaveParameters.cs">
- <Link>IHaveParameters.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\Message.cs">
- <Link>Message.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\MessageBinder.cs">
- <Link>MessageBinder.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\Parser.cs">
- <Link>Parser.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\Properties\AssemblyInfo.cs">
- <Link>Properties\AssemblyInfo.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\TypeDescriptor.cs">
- <Link>TypeDescriptor.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\View.cs">
- <Link>View.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\ViewLocator.cs">
- <Link>ViewLocator.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\ViewModelBinder.cs">
- <Link>ViewModelBinder.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\ViewModelLocator.cs">
- <Link>ViewModelLocator.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\win8\AppManifestHelper.cs">
- <Link>win8\AppManifestHelper.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\win8\AttachedCollection.81.cs">
- <Link>win8\AttachedCollection.81.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\win8\CachingFrameAdapter.cs">
- <Link>win8\CachingFrameAdapter.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\win8\CaliburnApplication.cs">
- <Link>win8\CaliburnApplication.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\win8\IAttachedObject.cs">
- <Link>win8\IAttachedObject.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\win8\INavigationService.cs">
- <Link>win8\INavigationService.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\win8\ISharingService.cs">
- <Link>win8\ISharingService.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\win8\ISupportSharing.cs">
- <Link>win8\ISupportSharing.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\win8\NavigateHelper.cs">
- <Link>win8\NavigateHelper.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\win8\NavigationExtensions.cs">
- <Link>win8\NavigationExtensions.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\win8\Parameter.cs">
- <Link>win8\Parameter.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\win8\SharingService.cs">
- <Link>win8\SharingService.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\win8\TriggerAction.cs">
- <Link>win8\TriggerAction.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\win8\WinRTContainer.cs">
- <Link>win8\WinRTContainer.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\win8\XamlMetadataProvider.cs">
- <Link>win8\XamlMetadataProvider.cs</Link>
- </Compile>
- <Compile Include="..\Caliburn.Micro.Platform\XamlPlatformProvider.cs">
- <Link>XamlPlatformProvider.cs</Link>
- </Compile>
- <Compile Include="..\GlobalAssemblyInfo.cs">
- <Link>Properties\GlobalAssemblyInfo.cs</Link>
- </Compile>
- <None Include="..\Caliburn.snk">
- <Link>Caliburn.snk</Link>
- </None>
- </ItemGroup>
- <ItemGroup>
<Content Include="Properties\Caliburn.Micro.Platform.UWP.rd.xml" />
</ItemGroup>
<ItemGroup>
@@ -246,6 +126,50 @@
<Name>Caliburn.Micro</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <None Include="Caliburn.Micro.Platform.UWP.project.json" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="..\GlobalAssemblyInfo.cs">
+ <Link>Properties\GlobalAssemblyInfo.cs</Link>
+ </Compile>
+ <Compile Include="Action.cs" />
+ <Compile Include="ActionExecutionContext.cs" />
+ <Compile Include="ActionMessage.cs" />
+ <Compile Include="Bind.cs" />
+ <Compile Include="BindingScope.cs" />
+ <Compile Include="BooleanToVisibilityConverter.cs" />
+ <Compile Include="ChildResolver.cs" />
+ <Compile Include="ConventionManager.cs" />
+ <Compile Include="DependencyPropertyHelper.cs" />
+ <Compile Include="ElementConvention.cs" />
+ <Compile Include="IHaveParameters.cs" />
+ <Compile Include="Message.cs" />
+ <Compile Include="MessageBinder.cs" />
+ <Compile Include="Parser.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="TypeDescriptor.cs" />
+ <Compile Include="View.cs" />
+ <Compile Include="ViewLocator.cs" />
+ <Compile Include="ViewModelBinder.cs" />
+ <Compile Include="ViewModelLocator.cs" />
+ <Compile Include="win8\AppManifestHelper.cs" />
+ <Compile Include="win8\AttachedCollection.81.cs" />
+ <Compile Include="win8\CachingFrameAdapter.cs" />
+ <Compile Include="win8\CaliburnApplication.cs" />
+ <Compile Include="win8\IAttachedObject.cs" />
+ <Compile Include="win8\INavigationService.cs" />
+ <Compile Include="win8\ISharingService.cs" />
+ <Compile Include="win8\ISupportSharing.cs" />
+ <Compile Include="win8\NavigateHelper.cs" />
+ <Compile Include="win8\NavigationExtensions.cs" />
+ <Compile Include="win8\Parameter.cs" />
+ <Compile Include="win8\SharingService.cs" />
+ <Compile Include="win8\TriggerAction.cs" />
+ <Compile Include="win8\WinRTContainer.cs" />
+ <Compile Include="win8\XamlMetadataProvider.cs" />
+ <Compile Include="XamlPlatformProvider.cs" />
+ </ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Platform.WIN81", "Caliburn.Micro.Platform\Caliburn.Micro.Platform.WIN81.csproj", "{73A34351-FB6A-489E-82DC-5790AF7693E3}"
EndProject
@@ -35,7 +35,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Platform.Xam
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Platform.Core", "Caliburn.Micro.Platform\Caliburn.Micro.Platform.Core.csproj", "{0ECBE3D9-AED4-419D-A6E3-C53D5CE2A02A}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Platform.UWP", "Caliburn.Micro.Platform.UWP\Caliburn.Micro.Platform.UWP.csproj", "{94D9A9C6-44C1-4E5A-877B-5761C963B2F6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Micro.Platform.UWP", "Caliburn.Micro.Platform\Caliburn.Micro.Platform.UWP.csproj", "{94D9A9C6-44C1-4E5A-877B-5761C963B2F6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

0 comments on commit ed2dc5b

Please sign in to comment.