From 4e7666c8c55ed85a290c30b42387ff36223c24a8 Mon Sep 17 00:00:00 2001
From: Ben Levy <ben@tippstr.com>
Date: Tue, 2 Aug 2016 13:11:18 +0800
Subject: [PATCH] GENERAL: Updated and Moved nuspec Added PCLAppConfig ref on
 filestream projects

---
 README.md                                     |  2 +-
 ...LAppConfig.FileSystemStream.Android.csproj |  6 +-
 .../PCLAppConfig.FileSystemStream.UWP.csproj  |  4 ++
 .../PCLAppConfig.FileSystemStream.iOS.csproj  |  4 ++
 .../PCLAppConfig.FileSystemStream.csproj      |  4 ++
 .../PortableStream.cs                         |  4 +-
 src/Lib/PCLAppConfig/PCLAppConfig.csproj      |  1 -
 src/Lib/PCLAppConfig/PCLAppConfig.nuspec      | 55 -------------------
 src/PCLAppConfig.nuspec                       | 55 +++++++++++++++++++
 src/{PCLCoreDemo.sln => PCLAppConfig.sln}     |  2 +
 10 files changed, 77 insertions(+), 60 deletions(-)
 delete mode 100644 src/Lib/PCLAppConfig/PCLAppConfig.nuspec
 create mode 100644 src/PCLAppConfig.nuspec
 rename src/{PCLCoreDemo.sln => PCLAppConfig.sln} (99%)

diff --git a/README.md b/README.md
index a2c4168..8f903d4 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ usage:
 ```
 
 - Add an app.config on your shared pcl project, and add your appSettings entries, as you would do with any app.config
-- Add this PCL app.config file as a linked file on all your platform projects. For android, make sure to set the build action to  'AndroidAsset'
+- Add this PCL app.config file as a linked file on all your platform projects. For android, make sure to set the build action to  'AndroidAsset', for UWP set the build action to 'Content'
 
 
 ### FOR EMBEDDED APP.CONFIG
diff --git a/src/Lib/PCLAppConfig.FileSystemStream.Android/PCLAppConfig.FileSystemStream.Android.csproj b/src/Lib/PCLAppConfig.FileSystemStream.Android/PCLAppConfig.FileSystemStream.Android.csproj
index 476e0a4..48478b6 100644
--- a/src/Lib/PCLAppConfig.FileSystemStream.Android/PCLAppConfig.FileSystemStream.Android.csproj
+++ b/src/Lib/PCLAppConfig.FileSystemStream.Android/PCLAppConfig.FileSystemStream.Android.csproj
@@ -32,7 +32,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>ANDROID</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -124,6 +124,10 @@
       <Project>{47adf18f-1bb7-45ae-addb-fa9291f2c532}</Project>
       <Name>PCLAppConfig.FileSystemStream.Abstractions</Name>
     </ProjectReference>
+    <ProjectReference Include="..\PCLAppConfig\PCLAppConfig.csproj">
+      <Project>{91435741-b785-4fd8-b486-fa157fd55852}</Project>
+      <Name>PCLAppConfig</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
diff --git a/src/Lib/PCLAppConfig.FileSystemStream.UWP/PCLAppConfig.FileSystemStream.UWP.csproj b/src/Lib/PCLAppConfig.FileSystemStream.UWP/PCLAppConfig.FileSystemStream.UWP.csproj
index c9b7108..1024ca2 100644
--- a/src/Lib/PCLAppConfig.FileSystemStream.UWP/PCLAppConfig.FileSystemStream.UWP.csproj
+++ b/src/Lib/PCLAppConfig.FileSystemStream.UWP/PCLAppConfig.FileSystemStream.UWP.csproj
@@ -119,6 +119,10 @@
       <Project>{47adf18f-1bb7-45ae-addb-fa9291f2c532}</Project>
       <Name>PCLAppConfig.FileSystemStream.Abstractions</Name>
     </ProjectReference>
+    <ProjectReference Include="..\PCLAppConfig\PCLAppConfig.csproj">
+      <Project>{91435741-b785-4fd8-b486-fa157fd55852}</Project>
+      <Name>PCLAppConfig</Name>
+    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
diff --git a/src/Lib/PCLAppConfig.FileSystemStream.iOS/PCLAppConfig.FileSystemStream.iOS.csproj b/src/Lib/PCLAppConfig.FileSystemStream.iOS/PCLAppConfig.FileSystemStream.iOS.csproj
index 4aacf9b..3bb3245 100644
--- a/src/Lib/PCLAppConfig.FileSystemStream.iOS/PCLAppConfig.FileSystemStream.iOS.csproj
+++ b/src/Lib/PCLAppConfig.FileSystemStream.iOS/PCLAppConfig.FileSystemStream.iOS.csproj
@@ -59,6 +59,10 @@
       <Project>{47adf18f-1bb7-45ae-addb-fa9291f2c532}</Project>
       <Name>PCLAppConfig.FileSystemStream.Abstractions</Name>
     </ProjectReference>
+    <ProjectReference Include="..\PCLAppConfig\PCLAppConfig.csproj">
+      <Project>{91435741-b785-4fd8-b486-fa157fd55852}</Project>
+      <Name>PCLAppConfig</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/src/Lib/PCLAppConfig.FileSystemStream/PCLAppConfig.FileSystemStream.csproj b/src/Lib/PCLAppConfig.FileSystemStream/PCLAppConfig.FileSystemStream.csproj
index 55864b5..dfe49ca 100644
--- a/src/Lib/PCLAppConfig.FileSystemStream/PCLAppConfig.FileSystemStream.csproj
+++ b/src/Lib/PCLAppConfig.FileSystemStream/PCLAppConfig.FileSystemStream.csproj
@@ -55,6 +55,10 @@
       <Project>{47adf18f-1bb7-45ae-addb-fa9291f2c532}</Project>
       <Name>PCLAppConfig.FileSystemStream.Abstractions</Name>
     </ProjectReference>
+    <ProjectReference Include="..\PCLAppConfig\PCLAppConfig.csproj">
+      <Project>{91435741-b785-4fd8-b486-fa157fd55852}</Project>
+      <Name>PCLAppConfig</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Lib/PCLAppConfig.FileSystemStream/PortableStream.cs b/src/Lib/PCLAppConfig.FileSystemStream/PortableStream.cs
index 48d2e54..718f657 100644
--- a/src/Lib/PCLAppConfig.FileSystemStream/PortableStream.cs
+++ b/src/Lib/PCLAppConfig.FileSystemStream/PortableStream.cs
@@ -23,7 +23,7 @@ public static Stream Current
 			}
 		}
 
-		public static Stream CreateAppConfigStream()
+		private static Stream CreateAppConfigStream()
 		{
 			var pathExtractor = CreateAppConfigPathExtractor();
 			if (pathExtractor == null)
@@ -34,7 +34,7 @@ You should reference the PCLAppConfig NuGet package from your main application p
 			return GetStream(pathExtractor.Path);
 		}
 
-		public static IAppConfigPathExtractor CreateAppConfigPathExtractor()
+		private static IAppConfigPathExtractor CreateAppConfigPathExtractor()
 		{
 #if ANDROID
 			return new AndroidAppConfigPathExtractor();
diff --git a/src/Lib/PCLAppConfig/PCLAppConfig.csproj b/src/Lib/PCLAppConfig/PCLAppConfig.csproj
index 3f319e9..b2ba984 100644
--- a/src/Lib/PCLAppConfig/PCLAppConfig.csproj
+++ b/src/Lib/PCLAppConfig/PCLAppConfig.csproj
@@ -51,7 +51,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
-    <None Include="PCLAppConfig.nuspec" />
     <None Include="PCLAppConfig.pfx" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
diff --git a/src/Lib/PCLAppConfig/PCLAppConfig.nuspec b/src/Lib/PCLAppConfig/PCLAppConfig.nuspec
deleted file mode 100644
index 1e50672..0000000
--- a/src/Lib/PCLAppConfig/PCLAppConfig.nuspec
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-<package >
-	<metadata>
-		<id>PCLAppConfig</id>
-		<version>0.3</version>
-		<title>PCL AppConfig - Portable AppSettings Reader</title>
-		<authors>Ben Ishiyama-levy (Xamariners), Seyyed Soroosh Hosseinalipour</authors>
-		<owners>Ben Ishiyama-levy (Xamariners)</owners>
-		<description>
-			Cross platform Xamarin forms AppSettings reader
-		</description>
-		<releaseNotes>
-			- Initial Release
-		</releaseNotes>
-		<summary>
-			Cross platform Xamarin forms AppSettings reader
-		</summary>
-		<language>en-US</language>
-		<projectUrl>https://github.com/mrbrl/PCLAppConfig</projectUrl>
-		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<licenseUrl>http://opensource.org/licenses/Apache-2.0</licenseUrl>
-		<copyright>Copyright Xamariners 2016</copyright>	
-		<tags>xamarin.forms PCL AppConfig AppSettings ConfigurationManager winrt android ios xamarin monoandroid monodroid monotouch</tags>
-    <dependencies>
-      <dependency id="PCLStorage" version="1.0.2"/>
-    </dependencies>
-	</metadata>
-	<files>
-    <!-- portable -->
-    <file src="bin\Release\PCLAppConfig.dll" target="lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\PCLAppConfig.dll" />
-    <file src="..\PCLAppConfig.FileSystemStream\bin\Release\PCLAppConfig.FileSystemStream.Abstractions.dll" target="lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\PCLAppConfig.FileSystemStream.Abstractions.dll" />
-    <file src="..\PCLAppConfig.FileSystemStream\bin\Release\PCLAppConfig.FileSystemStream.dll" target="lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\PCLAppConfig.FileSystemStream.dll" />
-    
-    <!-- ios -->
-    <!--<file src="bin\Release\PCLAppConfig.dll" target="lib\Xamarin.iOS\PCLAppConfig.dll" />-->
-    <file src="..\PCLAppConfig.FileSystemStream.iOS\bin\Release\PCLAppConfig.FileSystemStream.Abstractions.dll" target="lib\Xamarin.iOS\PCLAppConfig.FileSystemStream.Abstractions.dll" />
-    <file src="..\PCLAppConfig.FileSystemStream.iOS\bin\Release\PCLAppConfig.FileSystemStream.iOS.dll" target="lib\Xamarin.iOS\PCLAppConfig.FileSystemStream.iOS.dll" />
-
-    <!-- classic ios -->
-    <!--<file src="bin\Release\PCLAppConfig.dll" target="lib\MonoTouch10\PCLAppConfig.dll" />-->
-    <file src="..\PCLAppConfig.FileSystemStream.iOS\bin\Release\PCLAppConfig.FileSystemStream.Abstractions.dll" target="lib\MonoTouch10\PCLAppConfig.FileSystemStream.Abstractions.dll" />
-    <file src="..\PCLAppConfig.FileSystemStream.iOS\bin\Release\PCLAppConfig.FileSystemStream.iOS.dll" target="lib\MonoTouch10\PCLAppConfig.FileSystemStream.iOS.dll" />
-    
-    <!-- android -->
-    <!--<file src="bin\Release\PCLAppConfig.dll" target="lib\MonoAndroid10\PCLAppConfig.dll" />-->
-    <file src="..\PCLAppConfig.FileSystemStream.Android\bin\Release\PCLAppConfig.FileSystemStream.Abstractions.dll" target="lib\MonoAndroid10\PCLAppConfig.FileSystemStream.Abstractions.dll" />
-    <file src="..\PCLAppConfig.FileSystemStream.Android\bin\Release\PCLAppConfig.FileSystemStream.Android.dll" target="lib\MonoAndroid10\PCLAppConfig.FileSystemStream.Android.dll" />
-    
-    <!-- UWP -->
-    <!--<file src="bin\Release\PCLAppConfig.dll" target="lib\uap\PCLAppConfig.dll" />-->
-    <file src="..\PCLAppConfig.FileSystemStream.UWP\bin\Release\PCLAppConfig.FileSystemStream.Abstractions.dll" target="lib\uap\PCLAppConfig.FileSystemStream.Abstractions.dll" />
-    <file src="..\PCLAppConfig.FileSystemStream.UWP\bin\Release\PCLAppConfig.FileSystemStream.UWP.dll" target="lib\uap\PCLAppConfig.FileSystemStream.UWP.dll" />
-
-  </files>
-</package>
\ No newline at end of file
diff --git a/src/PCLAppConfig.nuspec b/src/PCLAppConfig.nuspec
new file mode 100644
index 0000000..ef76060
--- /dev/null
+++ b/src/PCLAppConfig.nuspec
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<package >
+	<metadata>
+		<id>PCLAppConfig</id>
+		<version>0.3</version>
+		<title>PCL AppConfig - Portable AppSettings Reader</title>
+		<authors>Ben Ishiyama-levy (Xamariners), Seyyed Soroosh Hosseinalipour</authors>
+		<owners>Ben Ishiyama-levy (Xamariners)</owners>
+		<description>
+			Cross platform Xamarin AppSettings reader
+		</description>
+		<releaseNotes>
+			- Initial Release
+		</releaseNotes>
+		<summary>
+			Cross platform Xamarin AppSettings reader
+		</summary>
+		<language>en-US</language>
+		<projectUrl>https://github.com/mrbrl/PCLAppConfig</projectUrl>
+		<requireLicenseAcceptance>false</requireLicenseAcceptance>
+		<licenseUrl>http://opensource.org/licenses/Apache-2.0</licenseUrl>
+		<copyright>Copyright Xamariners 2016</copyright>	
+		<tags>xamarin xamarin.forms PCL Config AppConfig AppSettings Configuration ConfigurationManager uwp winrt android ios xamarin monoandroid monodroid monotouch xamariners</tags>
+    <dependencies>
+      <dependency id="PCLStorage" version="1.0.2"/>
+    </dependencies>
+	</metadata>
+	<files>
+    <!-- portable -->
+    <file src="Lib\PCLAppConfig.FileSystemStream\bin\Release\PCLAppConfig.dll" target="lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\PCLAppConfig.dll" />
+    <file src="Lib\PCLAppConfig.FileSystemStream\bin\Release\PCLAppConfig.FileSystemStream.Abstractions.dll" target="lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\PCLAppConfig.FileSystemStream.Abstractions.dll" />
+    <file src="Lib\PCLAppConfig.FileSystemStream\bin\Release\PCLAppConfig.FileSystemStream.dll" target="lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\PCLAppConfig.FileSystemStream.dll" />
+    
+    <!-- ios -->
+    <file src="Lib\PCLAppConfig.FileSystemStream.iOS\bin\Release\PCLAppConfig.dll" target="lib\Xamarin.iOS\PCLAppConfig.dll" />
+    <file src="Lib\PCLAppConfig.FileSystemStream.iOS\bin\Release\PCLAppConfig.FileSystemStream.Abstractions.dll" target="lib\Xamarin.iOS\PCLAppConfig.FileSystemStream.Abstractions.dll" />
+    <file src="Lib\PCLAppConfig.FileSystemStream.iOS\bin\Release\PCLAppConfig.FileSystemStream.iOS.dll" target="lib\Xamarin.iOS\PCLAppConfig.FileSystemStream.iOS.dll" />
+
+    <!-- classic ios -->
+    <file src="Lib\PCLAppConfig.FileSystemStream.iOS\bin\Release\PCLAppConfig.dll" target="lib\MonoTouch10\PCLAppConfig.dll" />
+    <file src="Lib\PCLAppConfig.FileSystemStream.iOS\bin\Release\PCLAppConfig.FileSystemStream.Abstractions.dll" target="lib\MonoTouch10\PCLAppConfig.FileSystemStream.Abstractions.dll" />
+    <file src="Lib\PCLAppConfig.FileSystemStream.iOS\bin\Release\PCLAppConfig.FileSystemStream.iOS.dll" target="lib\MonoTouch10\PCLAppConfig.FileSystemStream.iOS.dll" />
+    
+    <!-- android -->
+    <file src="Lib\PCLAppConfig.FileSystemStream.Android\bin\Release\PCLAppConfig.dll" target="lib\MonoAndroid10\PCLAppConfig.dll" />
+    <file src="Lib\PCLAppConfig.FileSystemStream.Android\bin\Release\PCLAppConfig.FileSystemStream.Abstractions.dll" target="lib\MonoAndroid10\PCLAppConfig.FileSystemStream.Abstractions.dll" />
+    <file src="Lib\PCLAppConfig.FileSystemStream.Android\bin\Release\PCLAppConfig.FileSystemStream.Android.dll" target="lib\MonoAndroid10\PCLAppConfig.FileSystemStream.Android.dll" />
+    
+    <!-- UWP -->
+    <file src="Lib\PCLAppConfig.FileSystemStream.UWP\bin\Release\PCLAppConfig.dll" target="lib\UAP10\PCLAppConfig.dll" />
+    <file src="Lib\PCLAppConfig.FileSystemStream.UWP\bin\Release\PCLAppConfig.FileSystemStream.Abstractions.dll" target="lib\UAP10\PCLAppConfig.FileSystemStream.Abstractions.dll" />
+    <file src="Lib\PCLAppConfig.FileSystemStream.UWP\bin\Release\PCLAppConfig.FileSystemStream.UWP.dll" target="lib\UAP10\PCLAppConfig.FileSystemStream.UWP.dll" />
+
+  </files>
+</package>
\ No newline at end of file
diff --git a/src/PCLCoreDemo.sln b/src/PCLAppConfig.sln
similarity index 99%
rename from src/PCLCoreDemo.sln
rename to src/PCLAppConfig.sln
index 4bf1b47..e0971d2 100644
--- a/src/PCLCoreDemo.sln
+++ b/src/PCLAppConfig.sln
@@ -36,6 +36,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9D100221-BC18-4732-847E-6A6AEFB0FCBD}"
 	ProjectSection(SolutionItems) = preProject
 		global.json = global.json
+		PCLAppConfig.nuspec = PCLAppConfig.nuspec
 	EndProjectSection
 EndProject
 Global
@@ -339,6 +340,7 @@ Global
 		{C6CD8530-FECA-4B06-AFDD-7CC02D00FD4C}.Debug|x86.Build.0 = Debug|x86
 		{C6CD8530-FECA-4B06-AFDD-7CC02D00FD4C}.Debug|x86.Deploy.0 = Debug|x86
 		{C6CD8530-FECA-4B06-AFDD-7CC02D00FD4C}.Release|Any CPU.ActiveCfg = Release|x86
+		{C6CD8530-FECA-4B06-AFDD-7CC02D00FD4C}.Release|Any CPU.Build.0 = Release|x86
 		{C6CD8530-FECA-4B06-AFDD-7CC02D00FD4C}.Release|ARM.ActiveCfg = Release|ARM
 		{C6CD8530-FECA-4B06-AFDD-7CC02D00FD4C}.Release|ARM.Build.0 = Release|ARM
 		{C6CD8530-FECA-4B06-AFDD-7CC02D00FD4C}.Release|ARM.Deploy.0 = Release|ARM