Merge pull request #2 from sushihangover/restructure

Restructure project dirs
sushihangover · Dec 14, 2016 · 15b7f5e · 15b7f5e
2 parents d5b6ec9 + d0055d5
commit 15b7f5e
Show file tree

Hide file tree

Showing 74 changed files with 20 additions and 11 deletions.
diff --git a/CI/realm-dotnet.sh b/CI/realm-dotnet.sh
diff --git a/Nuget.Test/Droid/Assets/AboutAssets.txt → src/Nuget.Test/Droid/Assets/AboutAssets.txt b/Nuget.Test/Droid/Assets/AboutAssets.txt → src/Nuget.Test/Droid/Assets/AboutAssets.txt
diff --git a/Nuget.Test/Droid/FodyWeavers.xml → src/Nuget.Test/Droid/FodyWeavers.xml b/Nuget.Test/Droid/FodyWeavers.xml → src/Nuget.Test/Droid/FodyWeavers.xml
diff --git a/Nuget.Test/Droid/MainActivity.cs → src/Nuget.Test/Droid/MainActivity.cs b/Nuget.Test/Droid/MainActivity.cs → src/Nuget.Test/Droid/MainActivity.cs
diff --git a/Nuget.Test/Droid/Nuget.Test.Droid.csproj → src/Nuget.Test/Droid/Nuget.Test.Droid.csproj b/Nuget.Test/Droid/Nuget.Test.Droid.csproj → src/Nuget.Test/Droid/Nuget.Test.Droid.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Nuget.Test.Droid</RootNamespace>
     <AssemblyName>Nuget.Test.Droid</AssemblyName>
-    <TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>

diff --git a/...Test/Droid/Properties/AndroidManifest.xml → ...Test/Droid/Properties/AndroidManifest.xml b/...Test/Droid/Properties/AndroidManifest.xml → ...Test/Droid/Properties/AndroidManifest.xml
diff --git a/Nuget.Test/Droid/Properties/AssemblyInfo.cs → ...get.Test/Droid/Properties/AssemblyInfo.cs b/Nuget.Test/Droid/Properties/AssemblyInfo.cs → ...get.Test/Droid/Properties/AssemblyInfo.cs
diff --git a/...t.Test/Droid/Resources/AboutResources.txt → ...t.Test/Droid/Resources/AboutResources.txt b/...t.Test/Droid/Resources/AboutResources.txt → ...t.Test/Droid/Resources/AboutResources.txt
diff --git a/...Test/Droid/Resources/Resource.designer.cs → ...Test/Droid/Resources/Resource.designer.cs b/...Test/Droid/Resources/Resource.designer.cs → ...Test/Droid/Resources/Resource.designer.cs
diff --git a/...t.Test/Droid/Resources/layout/Tabbar.axml → ...t.Test/Droid/Resources/layout/Tabbar.axml b/...t.Test/Droid/Resources/layout/Tabbar.axml → ...t.Test/Droid/Resources/layout/Tabbar.axml
diff --git a/....Test/Droid/Resources/layout/Toolbar.axml → ....Test/Droid/Resources/layout/Toolbar.axml b/....Test/Droid/Resources/layout/Toolbar.axml → ....Test/Droid/Resources/layout/Toolbar.axml
diff --git a/...oid/Resources/mipmap-hdpi/ic_launcher.png → ...oid/Resources/mipmap-hdpi/ic_launcher.png b/...oid/Resources/mipmap-hdpi/ic_launcher.png → ...oid/Resources/mipmap-hdpi/ic_launcher.png
diff --git a/...oid/Resources/mipmap-mdpi/ic_launcher.png → ...oid/Resources/mipmap-mdpi/ic_launcher.png b/...oid/Resources/mipmap-mdpi/ic_launcher.png → ...oid/Resources/mipmap-mdpi/ic_launcher.png
diff --git a/...id/Resources/mipmap-xhdpi/ic_launcher.png → ...id/Resources/mipmap-xhdpi/ic_launcher.png b/...id/Resources/mipmap-xhdpi/ic_launcher.png → ...id/Resources/mipmap-xhdpi/ic_launcher.png
diff --git a/...d/Resources/mipmap-xxhdpi/ic_launcher.png → ...d/Resources/mipmap-xxhdpi/ic_launcher.png b/...d/Resources/mipmap-xxhdpi/ic_launcher.png → ...d/Resources/mipmap-xxhdpi/ic_launcher.png
diff --git a/.../Resources/mipmap-xxxhdpi/ic_launcher.png → .../Resources/mipmap-xxxhdpi/ic_launcher.png b/.../Resources/mipmap-xxxhdpi/ic_launcher.png → .../Resources/mipmap-xxxhdpi/ic_launcher.png
diff --git a/Nuget.Test/Droid/Resources/values/styles.xml → ...et.Test/Droid/Resources/values/styles.xml b/Nuget.Test/Droid/Resources/values/styles.xml → ...et.Test/Droid/Resources/values/styles.xml
diff --git a/Nuget.Test/Droid/packages.config → src/Nuget.Test/Droid/packages.config b/Nuget.Test/Droid/packages.config → src/Nuget.Test/Droid/packages.config
diff --git a/Nuget.Test/Nuget.Test/FodyWeavers.xml → src/Nuget.Test/Nuget.Test/FodyWeavers.xml b/Nuget.Test/Nuget.Test/FodyWeavers.xml → src/Nuget.Test/Nuget.Test/FodyWeavers.xml
diff --git a/Nuget.Test/Nuget.Test/Nuget.Test.cs → src/Nuget.Test/Nuget.Test/Nuget.Test.cs b/Nuget.Test/Nuget.Test/Nuget.Test.cs → src/Nuget.Test/Nuget.Test/Nuget.Test.cs
diff --git a/Nuget.Test/Nuget.Test/Nuget.Test.csproj → src/Nuget.Test/Nuget.Test/Nuget.Test.csproj b/Nuget.Test/Nuget.Test/Nuget.Test.csproj → src/Nuget.Test/Nuget.Test/Nuget.Test.csproj
diff --git a/...est/Nuget.Test/Properties/AssemblyInfo.cs → ...est/Nuget.Test/Properties/AssemblyInfo.cs b/...est/Nuget.Test/Properties/AssemblyInfo.cs → ...est/Nuget.Test/Properties/AssemblyInfo.cs
diff --git a/Nuget.Test/Nuget.Test/State.cs → src/Nuget.Test/Nuget.Test/State.cs b/Nuget.Test/Nuget.Test/State.cs → src/Nuget.Test/Nuget.Test/State.cs
diff --git a/Nuget.Test/Nuget.Test/States.json → src/Nuget.Test/Nuget.Test/States.json b/Nuget.Test/Nuget.Test/States.json → src/Nuget.Test/Nuget.Test/States.json
diff --git a/Nuget.Test/Nuget.Test/packages.config → src/Nuget.Test/Nuget.Test/packages.config b/Nuget.Test/Nuget.Test/packages.config → src/Nuget.Test/Nuget.Test/packages.config
diff --git a/Nuget.Test/iOS/AppDelegate.cs → src/Nuget.Test/iOS/AppDelegate.cs b/Nuget.Test/iOS/AppDelegate.cs → src/Nuget.Test/iOS/AppDelegate.cs
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/Nuget.Test/iOS/Assets.xcassets/Contents.json → ...et.Test/iOS/Assets.xcassets/Contents.json b/Nuget.Test/iOS/Assets.xcassets/Contents.json → ...et.Test/iOS/Assets.xcassets/Contents.json
diff --git a/Nuget.Test/iOS/Entitlements.plist → src/Nuget.Test/iOS/Entitlements.plist b/Nuget.Test/iOS/Entitlements.plist → src/Nuget.Test/iOS/Entitlements.plist
diff --git a/Nuget.Test/iOS/FodyWeavers.xml → src/Nuget.Test/iOS/FodyWeavers.xml b/Nuget.Test/iOS/FodyWeavers.xml → src/Nuget.Test/iOS/FodyWeavers.xml
diff --git a/Nuget.Test/iOS/Info.plist → src/Nuget.Test/iOS/Info.plist b/Nuget.Test/iOS/Info.plist → src/Nuget.Test/iOS/Info.plist
diff --git a/Nuget.Test/iOS/LaunchScreen.storyboard → src/Nuget.Test/iOS/LaunchScreen.storyboard b/Nuget.Test/iOS/LaunchScreen.storyboard → src/Nuget.Test/iOS/LaunchScreen.storyboard
diff --git a/Nuget.Test/iOS/Main.cs → src/Nuget.Test/iOS/Main.cs b/Nuget.Test/iOS/Main.cs → src/Nuget.Test/iOS/Main.cs
diff --git a/Nuget.Test/iOS/Nuget.Test.iOS.csproj → src/Nuget.Test/iOS/Nuget.Test.iOS.csproj b/Nuget.Test/iOS/Nuget.Test.iOS.csproj → src/Nuget.Test/iOS/Nuget.Test.iOS.csproj
diff --git a/Nuget.Test/iOS/packages.config → src/Nuget.Test/iOS/packages.config b/Nuget.Test/iOS/packages.config → src/Nuget.Test/iOS/packages.config
diff --git a/...on.Extensions/RealmJson.Extensions.nuspec → src/RealmJson.Extensions.nuspec b/...on.Extensions/RealmJson.Extensions.nuspec → src/RealmJson.Extensions.nuspec
diff --git a/RealmJson.Extensions/Extension.cs → src/RealmJson.Extensions/Extension.cs b/RealmJson.Extensions/Extension.cs → src/RealmJson.Extensions/Extension.cs
diff --git a/src/RealmJson.Extensions/FodyWeavers.xml b/src/RealmJson.Extensions/FodyWeavers.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+	<RealmWeaver/>
+
+</Weavers>
diff --git a/...son.Extensions/Properties/AssemblyInfo.cs → ...son.Extensions/Properties/AssemblyInfo.cs b/...son.Extensions/Properties/AssemblyInfo.cs → ...son.Extensions/Properties/AssemblyInfo.cs
diff --git a/...Extensions/SushiHangover.RealmJson.csproj → ...Extensions/SushiHangover.RealmJson.csproj b/...Extensions/SushiHangover.RealmJson.csproj → ...Extensions/SushiHangover.RealmJson.csproj
diff --git a/RealmJson.Extensions/packages.config → src/RealmJson.Extensions/packages.config b/RealmJson.Extensions/packages.config → src/RealmJson.Extensions/packages.config
diff --git a/...ed.Tests/RealmJson.Shared.Tests.projitems → ...ed.Tests/RealmJson.Shared.Tests.projitems b/...ed.Tests/RealmJson.Shared.Tests.projitems → ...ed.Tests/RealmJson.Shared.Tests.projitems
diff --git a/...hared.Tests/RealmJson.Shared.Tests.shproj → ...hared.Tests/RealmJson.Shared.Tests.shproj b/...hared.Tests/RealmJson.Shared.Tests.shproj → ...hared.Tests/RealmJson.Shared.Tests.shproj
diff --git a/RealmJson.Shared.Tests/SlidingStream.cs → src/RealmJson.Shared.Tests/SlidingStream.cs b/RealmJson.Shared.Tests/SlidingStream.cs → src/RealmJson.Shared.Tests/SlidingStream.cs
diff --git a/RealmJson.Shared.Tests/State.cs → src/RealmJson.Shared.Tests/State.cs b/RealmJson.Shared.Tests/State.cs → src/RealmJson.Shared.Tests/State.cs
diff --git a/...ared.Tests/Tests.Shared.Perf.Streaming.cs → ...ared.Tests/Tests.Shared.Perf.Streaming.cs b/...ared.Tests/Tests.Shared.Perf.Streaming.cs → ...ared.Tests/Tests.Shared.Perf.Streaming.cs
diff --git a/RealmJson.Shared.Tests/Tests.Shared.cs → src/RealmJson.Shared.Tests/Tests.Shared.cs b/RealmJson.Shared.Tests/Tests.Shared.cs → src/RealmJson.Shared.Tests/Tests.Shared.cs
diff --git a/RealmJson.Test.Droid/Assets/States.json → src/RealmJson.Test.Droid/Assets/States.json b/RealmJson.Test.Droid/Assets/States.json → src/RealmJson.Test.Droid/Assets/States.json
diff --git a/src/RealmJson.Test.Droid/FodyWeavers.xml b/src/RealmJson.Test.Droid/FodyWeavers.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+	<RealmWeaver/>
+
+</Weavers>
diff --git a/RealmJson.Test.Droid/MainActivity.cs → src/RealmJson.Test.Droid/MainActivity.cs b/RealmJson.Test.Droid/MainActivity.cs → src/RealmJson.Test.Droid/MainActivity.cs
diff --git a/...Test.Droid/Properties/AndroidManifest.xml → ...Test.Droid/Properties/AndroidManifest.xml b/...Test.Droid/Properties/AndroidManifest.xml → ...Test.Droid/Properties/AndroidManifest.xml
diff --git a/...son.Test.Droid/Properties/AssemblyInfo.cs → ...son.Test.Droid/Properties/AssemblyInfo.cs b/...son.Test.Droid/Properties/AssemblyInfo.cs → ...son.Test.Droid/Properties/AssemblyInfo.cs
diff --git a/...on.Test.Droid/RealmJson.Test.Droid.csproj → ...on.Test.Droid/RealmJson.Test.Droid.csproj b/...on.Test.Droid/RealmJson.Test.Droid.csproj → ...on.Test.Droid/RealmJson.Test.Droid.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>RealmJson.Test.Droid</RootNamespace>
     <AssemblyName>RealmJson.Test.Droid</AssemblyName>
-    <TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>

diff --git a/...n.Test.Droid/Resources/AboutResources.txt → ...n.Test.Droid/Resources/AboutResources.txt b/...n.Test.Droid/Resources/AboutResources.txt → ...n.Test.Droid/Resources/AboutResources.txt
diff --git a/...Test.Droid/Resources/Resource.designer.cs → ...Test.Droid/Resources/Resource.designer.cs b/...Test.Droid/Resources/Resource.designer.cs → ...Test.Droid/Resources/Resource.designer.cs
diff --git a/...oid/Resources/mipmap-hdpi/ic_launcher.png → ...oid/Resources/mipmap-hdpi/ic_launcher.png b/...oid/Resources/mipmap-hdpi/ic_launcher.png → ...oid/Resources/mipmap-hdpi/ic_launcher.png
diff --git a/...oid/Resources/mipmap-mdpi/ic_launcher.png → ...oid/Resources/mipmap-mdpi/ic_launcher.png b/...oid/Resources/mipmap-mdpi/ic_launcher.png → ...oid/Resources/mipmap-mdpi/ic_launcher.png
diff --git a/...id/Resources/mipmap-xhdpi/ic_launcher.png → ...id/Resources/mipmap-xhdpi/ic_launcher.png b/...id/Resources/mipmap-xhdpi/ic_launcher.png → ...id/Resources/mipmap-xhdpi/ic_launcher.png
diff --git a/...d/Resources/mipmap-xxhdpi/ic_launcher.png → ...d/Resources/mipmap-xxhdpi/ic_launcher.png b/...d/Resources/mipmap-xxhdpi/ic_launcher.png → ...d/Resources/mipmap-xxhdpi/ic_launcher.png
diff --git a/.../Resources/mipmap-xxxhdpi/ic_launcher.png → .../Resources/mipmap-xxxhdpi/ic_launcher.png b/.../Resources/mipmap-xxxhdpi/ic_launcher.png → .../Resources/mipmap-xxxhdpi/ic_launcher.png
diff --git a/RealmJson.Test.Droid/TestInstrumentation.cs → ...almJson.Test.Droid/TestInstrumentation.cs b/RealmJson.Test.Droid/TestInstrumentation.cs → ...almJson.Test.Droid/TestInstrumentation.cs
diff --git a/RealmJson.Test.Droid/Tests.Android.cs → src/RealmJson.Test.Droid/Tests.Android.cs b/RealmJson.Test.Droid/Tests.Android.cs → src/RealmJson.Test.Droid/Tests.Android.cs
diff --git a/RealmJson.Test.Droid/packages.config → src/RealmJson.Test.Droid/packages.config b/RealmJson.Test.Droid/packages.config → src/RealmJson.Test.Droid/packages.config
diff --git a/RealmJson.Test.iOS/Data/States.json → src/RealmJson.Test.iOS/Data/States.json b/RealmJson.Test.iOS/Data/States.json → src/RealmJson.Test.iOS/Data/States.json
diff --git a/RealmJson.Test.iOS/Entitlements.plist → src/RealmJson.Test.iOS/Entitlements.plist b/RealmJson.Test.iOS/Entitlements.plist → src/RealmJson.Test.iOS/Entitlements.plist
diff --git a/src/RealmJson.Test.iOS/FodyWeavers.xml b/src/RealmJson.Test.iOS/FodyWeavers.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+	<RealmWeaver/>
+
+</Weavers>
diff --git a/RealmJson.Test.iOS/Info.plist → src/RealmJson.Test.iOS/Info.plist b/RealmJson.Test.iOS/Info.plist → src/RealmJson.Test.iOS/Info.plist
diff --git a/RealmJson.Test.iOS/LaunchScreen.storyboard → ...ealmJson.Test.iOS/LaunchScreen.storyboard b/RealmJson.Test.iOS/LaunchScreen.storyboard → ...ealmJson.Test.iOS/LaunchScreen.storyboard
diff --git a/RealmJson.Test.iOS/Main.cs → src/RealmJson.Test.iOS/Main.cs b/RealmJson.Test.iOS/Main.cs → src/RealmJson.Test.iOS/Main.cs
diff --git a/RealmJson.Test.iOS/RealmJson.Test.iOS.csproj → ...lmJson.Test.iOS/RealmJson.Test.iOS.csproj b/RealmJson.Test.iOS/RealmJson.Test.iOS.csproj → ...lmJson.Test.iOS/RealmJson.Test.iOS.csproj
diff --git a/RealmJson.Test.iOS/Tests.iOS.cs → src/RealmJson.Test.iOS/Tests.iOS.cs b/RealmJson.Test.iOS/Tests.iOS.cs → src/RealmJson.Test.iOS/Tests.iOS.cs
diff --git a/RealmJson.Test.iOS/UnitTestAppDelegate.cs → ...RealmJson.Test.iOS/UnitTestAppDelegate.cs b/RealmJson.Test.iOS/UnitTestAppDelegate.cs → ...RealmJson.Test.iOS/UnitTestAppDelegate.cs
diff --git a/RealmJson.Test.iOS/packages.config → src/RealmJson.Test.iOS/packages.config b/RealmJson.Test.iOS/packages.config → src/RealmJson.Test.iOS/packages.config
diff --git a/RealmJsonExtensions.sln → src/RealmJsonExtensions.sln b/RealmJsonExtensions.sln → src/RealmJsonExtensions.sln
@@ -11,11 +11,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RealmJson.Test.iOS", "Realm
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{107F0B2C-9E27-4B12-B9D4-65DA834DF134}"
 	ProjectSection(SolutionItems) = preProject
-		README.md = README.md
-		Perf.md = Perf.md
-		media\RealmJson.Extensions.md = media\RealmJson.Extensions.md
-		.nuget\NuGet.targets = .nuget\NuGet.targets
 		RealmJson.Extensions\RealmJson.Extensions.nuspec = RealmJson.Extensions\RealmJson.Extensions.nuspec
+		..\README.md = ..\README.md
+		..\Perf.md = ..\Perf.md
+		..\LICENSE = ..\LICENSE
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Nuget.Test", "Nuget.Test", "{66FF9BD8-BF3C-4767-840B-70261446819F}"