Revert lineups change until we work out issues with PackageLineup

This reverts commit a2c0410e39.
2017-08-18 10:43:19 -07:00 · 2017-08-18 10:43:19 -07:00 · 01bf47170f
parent a2c0410e39
commit 01bf47170f
13 changed files with 61 additions and 92 deletions
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -1,14 +0,0 @@
-<Project>
-  <Import Project="version.xml" />
-
-  <PropertyGroup>
-    <Product>Microsoft ASP.NET Core</Product>
-    <RepositoryUrl>https://github.com/aspnet/JsonPatch</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
-    <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-</Project>
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@ -1,14 +0,0 @@
-<Project InitialTargets="EnsureKoreBuildRestored">
-  <Target Name="EnsureKoreBuildRestored" Condition=" '$(KoreBuildRestoreTargetsImported)' != 'true' ">
-    <PropertyGroup>
-      <_BootstrapperFile Condition=" $([MSBuild]::IsOSUnixLike()) ">build.sh</_BootstrapperFile>
-      <_BootstrapperFile Condition="! $([MSBuild]::IsOSUnixLike()) ">build.cmd</_BootstrapperFile>
-      <_BootstrapperError>
-        Package references have not been pinned. Run './$(_BootstrapperFile) /t:Pin'.
-        Also, you can run './$(_BootstrapperFile) /t:Restore' which will pin *and* restore packages. '$(_BootstrapperFile)' can be found in '$(MSBuildThisFileDirectory)'.
-      </_BootstrapperError>
-    </PropertyGroup>
-
-    <Error Code="KRB1001" Text="$(_BootstrapperError.Trim())" />
-  </Target>
-</Project>
--- a/JsonPatch.sln
+++ b/JsonPatch.sln
@ -1,16 +1,10 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26815.3
+VisualStudioVersion = 15.0.26222.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{430B59ED-F960-4D3A-8FFE-3370008E168D}"
-	ProjectSection(SolutionItems) = preProject
-		src\Directory.Build.props = src\Directory.Build.props
-	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{36CD6341-AB44-44EB-B3AA-BF98C89FECDD}"
-	ProjectSection(SolutionItems) = preProject
-		test\Directory.Build.props = test\Directory.Build.props
-	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.JsonPatch", "src\Microsoft.AspNetCore.JsonPatch\Microsoft.AspNetCore.JsonPatch.csproj", "{4D55F4D8-633B-462F-A5B1-FEB84BD2D534}"
 EndProject
@ -18,21 +12,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.JsonPa
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C430C499-382D-47BD-B351-CF8F89C08CD2}"
 	ProjectSection(SolutionItems) = preProject
-		.appveyor.yml = .appveyor.yml
-		.gitattributes = .gitattributes
-		.gitignore = .gitignore
-		.travis.yml = .travis.yml
-		build.cmd = build.cmd
-		build.ps1 = build.ps1
-		build.sh = build.sh
-		CONTRIBUTING.md = CONTRIBUTING.md
-		Directory.Build.props = Directory.Build.props
-		Directory.Build.targets = Directory.Build.targets
-		LICENSE.txt = LICENSE.txt
 		NuGet.config = NuGet.config
-		NuGetPackageVerifier.json = NuGetPackageVerifier.json
-		README.md = README.md
-		version.xml = version.xml
 	EndProjectSection
 EndProject
 Global
@ -57,7 +37,4 @@ Global
 		{4D55F4D8-633B-462F-A5B1-FEB84BD2D534} = {430B59ED-F960-4D3A-8FFE-3370008E168D}
 		{81C20848-E063-4E12-AC40-0B55A532C16C} = {36CD6341-AB44-44EB-B3AA-BF98C89FECDD}
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {9FFA3EB9-8740-4434-BC8C-F3D595161B59}
-	EndGlobalSection
 EndGlobal
--- a/.appveyor.yml
+++ b/.appveyor.yml
--- a/build/common.props
+++ b/build/common.props
@ -0,0 +1,24 @@
+<Project>
+  <Import Project="dependencies.props" />
+  <Import Project="..\version.xml" />
+
+  <PropertyGroup>
+    <Product>Microsoft ASP.NET Core</Product>
+    <RepositoryUrl>https://github.com/aspnet/JsonPatch</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
+    <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkVersion)" PrivateAssets="All" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework' AND '$(OutputType)'=='library'">
+    <PackageReference Include="NETStandard.Library" Version="$(NETStandardImplicitPackageVersion)" />
+  </ItemGroup>
+
+</Project>
--- a/build/dependencies.props
+++ b/build/dependencies.props
@ -0,0 +1,14 @@
+<Project>
+  <PropertyGroup>
+    <AspNetCoreVersion>2.1.0-*</AspNetCoreVersion>
+    <CoreFxVersion>4.4.0-*</CoreFxVersion>
+    <InternalAspNetCoreSdkVersion>2.1.1-*</InternalAspNetCoreSdkVersion>
+    <JsonNetVersion>10.0.1</JsonNetVersion>
+    <MoqVersion>4.7.49</MoqVersion>
+    <NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion>
+    <NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
+    <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
+    <TestSdkVersion>15.3.0-*</TestSdkVersion>
+    <XunitVersion>2.3.0-beta2-*</XunitVersion>
+  </PropertyGroup>
+</Project>
--- a/build/repo.props
+++ b/build/repo.props
@ -1,6 +0,0 @@
-<Project>
-  <ItemGroup>
-    <PackageLineup Include="Internal.AspNetCore.Universe.Lineup" Version="2.1.0-*" />
-    <PackageLineup Include="Internal.AspNetCore.Partners.Lineup" Version="2.1.0-*" />
-  </ItemGroup>
-</Project>
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@ -1,7 +0,0 @@
-<Project>
-  <Import Project="..\Directory.Build.props" />
-
-  <ItemGroup>
-    <PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" />
-  </ItemGroup>
-</Project>
--- a/src/Microsoft.AspNetCore.JsonPatch/Microsoft.AspNetCore.JsonPatch.csproj
+++ b/src/Microsoft.AspNetCore.JsonPatch/Microsoft.AspNetCore.JsonPatch.csproj
@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\..\build\common.props" />

  <PropertyGroup>
    <Description>ASP.NET Core support for JSON PATCH.</Description>
@ -9,9 +10,9 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" />
-    <PackageReference Include="Newtonsoft.Json" />
-    <PackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CSharp" Version="$(CoreFxVersion)" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" />
+    <PackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
  </ItemGroup>

 </Project>
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@ -1,11 +0,0 @@
-<Project>
-  <Import Project="..\Directory.Build.props" />
-
-  <ItemGroup>
-    <PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit.analyzers" />
-    <PackageReference Include="xunit.runner.visualstudio" />
-    <PackageReference Include="xunit" />
-  </ItemGroup>
-</Project>
--- a/test/Microsoft.AspNetCore.JsonPatch.Test/DictionaryAdapterTest.cs
+++ b/test/Microsoft.AspNetCore.JsonPatch.Test/DictionaryAdapterTest.cs
@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.JsonPatch.Internal
            // Assert
            Assert.True(addStatus);
            Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
-            Assert.Single(dictionary);
+            Assert.Equal(1, dictionary.Count);
            Assert.Equal("James", dictionary[nameKey]);
        }

@ -48,7 +48,7 @@ namespace Microsoft.AspNetCore.JsonPatch.Internal
            // Assert
            Assert.True(addStatus);
            Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
-            Assert.Single(dictionary);
+            Assert.Equal(1, dictionary.Count);
            Assert.Equal("James", dictionary[nameKey]);

            // Act
@ -77,7 +77,7 @@ namespace Microsoft.AspNetCore.JsonPatch.Internal
            // Assert
            Assert.True(addStatus);
            Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
-            Assert.Single(dictionary);
+            Assert.Equal(1, dictionary.Count);
            Assert.Equal("James", dictionary[nameKey]);

            // Act
@ -107,7 +107,7 @@ namespace Microsoft.AspNetCore.JsonPatch.Internal
            // Assert
            Assert.True(replaceStatus);
            Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
-            Assert.Single(dictionary);
+            Assert.Equal(1, dictionary.Count);
            Assert.Equal("James", dictionary[nameKey]);
        }

@ -129,7 +129,7 @@ namespace Microsoft.AspNetCore.JsonPatch.Internal
            Assert.Equal(
                string.Format("The target location specified by path segment '{0}' was not found.", nameKey),
                message);
-            Assert.Empty(dictionary);
+            Assert.Equal(0, dictionary.Count);
        }

        [Fact]
@ -150,7 +150,7 @@ namespace Microsoft.AspNetCore.JsonPatch.Internal
            Assert.Equal(
                string.Format("The target location specified by path segment '{0}' was not found.", nameKey),
                message);
-            Assert.Empty(dictionary);
+            Assert.Equal(0, dictionary.Count);
        }

        [Fact]
@ -170,7 +170,7 @@ namespace Microsoft.AspNetCore.JsonPatch.Internal
            //Assert
            Assert.True(removeStatus);
            Assert.True(string.IsNullOrEmpty(message), "Expected no error message");
-            Assert.Empty(dictionary);
+            Assert.Equal(0, dictionary.Count);
        }
    }
 }
--- a/test/Microsoft.AspNetCore.JsonPatch.Test/Microsoft.AspNetCore.JsonPatch.Test.csproj
+++ b/test/Microsoft.AspNetCore.JsonPatch.Test/Microsoft.AspNetCore.JsonPatch.Test.csproj
@ -1,5 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

+  <Import Project="..\..\build\common.props" />
+
  <PropertyGroup>
    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
@ -10,8 +12,11 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Testing" />
-    <PackageReference Include="Moq" />
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
+    <PackageReference Include="Moq" Version="$(MoqVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
  </ItemGroup>

 </Project>
--- a/test/Microsoft.AspNetCore.JsonPatch.Test/ObjectAdapterTests.cs
+++ b/test/Microsoft.AspNetCore.JsonPatch.Test/ObjectAdapterTests.cs
@ -720,8 +720,8 @@ namespace Microsoft.AspNetCore.JsonPatch.Adapters
            var serialized = JsonConvert.SerializeObject(patchDoc);

            // Assert
-            Assert.DoesNotContain("operations", serialized);
-            Assert.DoesNotContain("Operations", serialized);
+            Assert.False(serialized.Contains("operations"));
+            Assert.False(serialized.Contains("Operations"));
        }

        [Fact]
@ -2061,7 +2061,7 @@ namespace Microsoft.AspNetCore.JsonPatch.Adapters
            patchDoc.ApplyTo(model);

            // Assert
-            Assert.Single(model);
+            Assert.Equal(1, model.Count);
            Assert.Equal(expected, model["WA"]);
        }

@ -2080,7 +2080,7 @@ namespace Microsoft.AspNetCore.JsonPatch.Adapters
            deserialized.ApplyTo(model);

            // Assert
-            Assert.Single(model);
+            Assert.Equal(1, model.Count);
            Assert.Equal(expected, model["WA"]);
        }