Move projects back to the repo root

tests/System.IO.Abstractions.TestingHelpers.Tests/System.IO.Abstractions.TestingHelpers.Tests.csproj → System.IO.Abstractions.TestingHelpers.Tests/System.IO.Abstractions.TestingHelpers.Tests.csproj

@@ -3,6 +3,7 @@
     <TargetFrameworks>netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
     <TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">$(TargetFrameworks);net472</TargetFrameworks>
     <Description>The unit tests for our pre-built mocks</Description>
+    <AssemblyName>System.IO.Abstractions.TestingHelpers.Tests</AssemblyName>
     <RootNamespace>System.IO.Abstractions.TestingHelpers.Tests</RootNamespace>
     <IsPackable>false</IsPackable>
     <IsTestable>true</IsTestable>
@@ -17,8 +18,8 @@
     <EmbeddedResource Include="TestFiles\TestFile.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../../src/System.IO.Abstractions/System.IO.Abstractions.csproj" />
-    <ProjectReference Include="../../src/System.IO.Abstractions.TestingHelpers/System.IO.Abstractions.TestingHelpers.csproj" />
+    <ProjectReference Include="../System.IO.Abstractions/System.IO.Abstractions.csproj" />
+    <ProjectReference Include="../System.IO.Abstractions.TestingHelpers/System.IO.Abstractions.TestingHelpers.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />

System.IO.Abstractions.TestingHelpers/System.IO.Abstractions.TestingHelpers.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <AssemblyName>System.IO.Abstractions.TestingHelpers</AssemblyName>
+        <RootNamespace>System.IO.Abstractions.TestingHelpers</RootNamespace>
+        <Description>A set of pre-built mocks to help when testing file system interactions.</Description>
+        <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+        <PackageProjectUrl>https://github.com/System-IO-Abstractions/System.IO.Abstractions</PackageProjectUrl>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <PackageTags>testing</PackageTags>
+        <DefineConstants Condition="'$(TargetFramework)' == 'netstandard2.1'">$(DefineConstants);FEATURE_ASYNC_FILE;FEATURE_ENUMERATION_OPTIONS</DefineConstants>
+    </PropertyGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\System.IO.Abstractions\System.IO.Abstractions.csproj" />
+    </ItemGroup>
+</Project>

System.IO.Abstractions.sln

@@ -9,11 +9,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		StrongName.snk = StrongName.snk
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Abstractions.TestingHelpers.Tests", "tests/System.IO.Abstractions.TestingHelpers.Tests\System.IO.Abstractions.TestingHelpers.Tests.csproj", "{20B02738-952A-40F5-9C10-E2F83013E9FC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Abstractions.TestingHelpers.Tests", "System.IO.Abstractions.TestingHelpers.Tests\System.IO.Abstractions.TestingHelpers.Tests.csproj", "{20B02738-952A-40F5-9C10-E2F83013E9FC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Abstractions", "src/System.IO.Abstractions\System.IO.Abstractions.csproj", "{B7DA254D-496F-4C50-969C-CF925758E2ED}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Abstractions", "System.IO.Abstractions\System.IO.Abstractions.csproj", "{B7DA254D-496F-4C50-969C-CF925758E2ED}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Abstractions.TestingHelpers", "src/System.IO.Abstractions.TestingHelpers\System.IO.Abstractions.TestingHelpers.csproj", "{0103D32A-6124-4A1A-AD6C-30EB957F09B0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Abstractions.TestingHelpers", "System.IO.Abstractions.TestingHelpers\System.IO.Abstractions.TestingHelpers.csproj", "{0103D32A-6124-4A1A-AD6C-30EB957F09B0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/Directory.Build.props → System.IO.Abstractions/System.IO.Abstractions.csproj

@@ -1,10 +1,11 @@
-<Project>
-  <Import Project="../Directory.Build.props" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <AssemblyName>System.IO.Abstractions</AssemblyName>
+    <RootNamespace>System.IO.Abstractions</RootNamespace>
+    <Description>A set of abstractions to help make file system interactions testable.</Description>
     <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <PackageProjectUrl>https://github.com/System-IO-Abstractions/System.IO.Abstractions</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageLicenseUrl>https://github.com/System-IO-Abstractions/System.IO.Abstractions/blob/master/LICENSE</PackageLicenseUrl>
     <PackageTags>testing</PackageTags>
     <DefineConstants Condition="'$(TargetFramework)' == 'netstandard2.1'">$(DefineConstants);FEATURE_ASYNC_FILE;FEATURE_ENUMERATION_OPTIONS</DefineConstants>
   </PropertyGroup>

appveyor.yml

@@ -1,6 +1,6 @@
-image: 
-- Visual Studio 2019
-- Ubuntu
+image:
+  - Visual Studio 2019
+  - Ubuntu
 
 configuration: Release
 
@@ -21,39 +21,39 @@ environment:
   APPVEYOR_YML_DISABLE_PS_LINUX: true
 
 install:
-# Temporarily install InheritDoc using the NuGet CLI
-- cmd: nuget install inheritdoc -Version %INHERITDOC_VERSION% -OutputDirectory %TEMP_DIR%
+  # Temporarily install InheritDoc using the NuGet CLI
+  - cmd: nuget install inheritdoc -Version %INHERITDOC_VERSION% -OutputDirectory %TEMP_DIR%
+
+before_build:
+  - nuget restore
 
-before_build:		
-- nuget restore
-
 build:
   publish_nuget: true
+  publish_nuget_symbols: true
 
 before_package:
-# This step replaces the inheritdoc tags in the xml documentation with documentation from mscorlib.xml
-- ps: '& $env:TEMP_DIR\InheritDoc.$env:INHERITDOC_VERSION\tools\InheritDoc.exe -b $env:APPVEYOR_BUILD_FOLDER -g "c:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.X\mscorlib.xml" -o'
+  # This step replaces the inheritdoc tags in the xml documentation with documentation from mscorlib.xml
+  - ps: '& $env:TEMP_DIR\InheritDoc.$env:INHERITDOC_VERSION\tools\InheritDoc.exe -b $env:APPVEYOR_BUILD_FOLDER -g "c:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.X\mscorlib.xml" -o'
 
 # Perform deployments only for Windows job
 for:
--
-  matrix:
-    only:
-      - image: Visual Studio 2019
-  deploy:
-  - provider: NuGet
-    api_key:
-      secure: dZ2lowWe8KkDiUSXgKS/SulxjuKVSN6t7Jfzfx6co664SRxoXnX+3nsVpYZAJtla
-    skip_symbols: false
-    artifact: /.*\.nupkg/
-    on:
-      branch: master
-
-  - provider: GitHub
-    tag: v$(appveyor_build_version)
-    prerelease: false
-    artifact: /.*\.nupkg/
-    auth_token:
-      secure: Rrk1zp93EpCyxec/GXKnRnJjX7vU+ClNZEBnxbM+1j6l+C56qSV7B/fUrVsJuZYV
-    on: 
-      branch: master
+  - matrix:
+      only:
+        - image: Visual Studio 2019
+    deploy:
+      - provider: NuGet
+        api_key:
+          secure: dZ2lowWe8KkDiUSXgKS/SulxjuKVSN6t7Jfzfx6co664SRxoXnX+3nsVpYZAJtla
+        skip_symbols: false
+        artifact: /.*\.nupkg/
+        on:
+          branch: master
+
+      - provider: GitHub
+        tag: v$(appveyor_build_version)
+        prerelease: false
+        artifact: /.*\.nupkg/
+        auth_token:
+          secure: Rrk1zp93EpCyxec/GXKnRnJjX7vU+ClNZEBnxbM+1j6l+C56qSV7B/fUrVsJuZYV
+        on:
+          branch: master