Add unit tests for the shared framework

Changes:
* Add a test project with simple unit tests for the shared framework
* Add root-level Directory.Build.props/targets files
* Cleanup .csproj files to reduce duplication

Directory.Build.props

@@ -0,0 +1,6 @@
+<Project>
+  <Import Project="version.props" />
+  <Import Project="build\common.props" />
+  <Import Project="build\external-dependencies.props" />
+  <Import Project="build\sources.props" />
+</Project>

Directory.Build.targets

@@ -0,0 +1,9 @@
+<Project>
+  <PropertyGroup>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">$(MicrosoftNETCoreApp22PackageVersion)</RuntimeFrameworkVersion>
+    <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
+    <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
+    <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
+  </PropertyGroup>
+</Project>

Microsoft.AspNetCore.sln

@@ -0,0 +1,39 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26124.0
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{EE2CAA71-82AA-41C0-AE87-5B4FB77D6CFE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedFx.UnitTests", "test\SharedFx.UnitTests\SharedFx.UnitTests.csproj", "{99CC38EC-902B-4B3F-AD33-177018110199}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{99CC38EC-902B-4B3F-AD33-177018110199}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{99CC38EC-902B-4B3F-AD33-177018110199}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{99CC38EC-902B-4B3F-AD33-177018110199}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{99CC38EC-902B-4B3F-AD33-177018110199}.Debug|x64.Build.0 = Debug|Any CPU
+		{99CC38EC-902B-4B3F-AD33-177018110199}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{99CC38EC-902B-4B3F-AD33-177018110199}.Debug|x86.Build.0 = Debug|Any CPU
+		{99CC38EC-902B-4B3F-AD33-177018110199}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{99CC38EC-902B-4B3F-AD33-177018110199}.Release|Any CPU.Build.0 = Release|Any CPU
+		{99CC38EC-902B-4B3F-AD33-177018110199}.Release|x64.ActiveCfg = Release|Any CPU
+		{99CC38EC-902B-4B3F-AD33-177018110199}.Release|x64.Build.0 = Release|Any CPU
+		{99CC38EC-902B-4B3F-AD33-177018110199}.Release|x86.ActiveCfg = Release|Any CPU
+		{99CC38EC-902B-4B3F-AD33-177018110199}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{99CC38EC-902B-4B3F-AD33-177018110199} = {EE2CAA71-82AA-41C0-AE87-5B4FB77D6CFE}
+	EndGlobalSection
+EndGlobal

build/SharedFx.targets

@@ -197,7 +197,7 @@
       <VersionLines Include="$(PackageVersion)" />
     </ItemGroup>
 
-     <!-- Publish -->
+    <!-- Publish -->
     <MSBuild Projects="$(SharedFxWorkDirectory)SharedFx.csproj"
       Targets="Publish"
       Properties="$(CommonSharedFxProps);GenerateRuntimeConfigurationFiles=true;SelfContained=false;PublishDir=$(SharedFxPublishDirectory)" />
@@ -528,6 +528,21 @@
       Overwrite="true"/>
   </Target>
 
-  <Target Name="BuildSharedFx" DependsOnTargets="GeneratePropsFiles;ResolveSharedFxFiles;CrossGenAssemblies;CrossGenSymbols;PackSharedFx"/>
+  <Target Name="BuildSharedFx" DependsOnTargets="GeneratePropsFiles;ResolveSharedFxFiles;CrossGenAssemblies;CrossGenSymbols;PackSharedFx;TestSharedFx"/>
+
+  <Target Name="TestSharedFx" DependsOnTargets="DefineSharedFxPrerequisites;ResolveCommitHash">
+    <PropertyGroup>
+      <UnitTestFxProject>$(RepositoryRoot)\test\SharedFx.UnitTests\SharedFx.UnitTests.csproj</UnitTestFxProject>
+      <UnitTestFxTestProps>
+        DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath);
+        DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath);
+        SharedFxOutputPath=$(SharedFxIntermediateOutputPath);
+        RepositoryCommit=$(RepositoryCommit);
+        SharedFxRuntimeIdentifier=$(SharedFXRid)
+      </UnitTestFxTestProps>
+    </PropertyGroup>
+    <MSBuild Projects="$(UnitTestFxProject)" Targets="Restore" Properties="_Dummy=restore;$(UnitTestFxTestProps)" />
+    <MSBuild Projects="$(UnitTestFxProject)" Targets="VSTest" Properties="$(UnitTestFxTestProps)" />
+  </Target>
 
 </Project>

build/common.props

@@ -11,8 +11,4 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkPackageVersion)" PrivateAssets="All" />
-  </ItemGroup>
-
 </Project>

build/dependencies.props

@@ -38,6 +38,7 @@
   <PropertyGroup>
     <!-- Assign this variable last because it may be updated from DotNetPackageVersionPropsPath as MicrosoftNETCoreAppPackageVersion. -->
     <MicrosoftNETCoreApp22PackageVersion Condition="'$(MicrosoftNETCoreAppPackageVersion)' != ''">$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreApp22PackageVersion>
+    <MicrosoftNETCoreAppPackageVersion Condition="'$(MicrosoftNETCoreAppPackageVersion)' == ''">$(MicrosoftNETCoreApp22PackageVersion)</MicrosoftNETCoreAppPackageVersion>
 
     <!-- Determined by build tools -->
     <InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion>

build/tasks/RepoTasks.csproj

@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$(RepoTasksSdkPath)\Sdk.props" Condition="'$(RepoTasksSdkPath)' != '' "/>
-  <Import Project="..\dependencies.props" />
-  <Import Project="..\sources.props" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>

build/tools/templates/Archive/Archive.csproj

@@ -1,15 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
-
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <EnableApiCheck>false</EnableApiCheck>
-    <RestoreSources>$(RestoreSources);$(DotNetRestoreSources);</RestoreSources>
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
-
-    <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
-    <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
   </PropertyGroup>
 

build/tools/templates/SharedFx/SharedFx.csproj

@@ -1,15 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''" />
+<Project Sdk="Microsoft.NET.Sdk" >
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-    <RestoreSources>$(RestoreSources);$(DotNetRestoreSources);</RestoreSources>
-
-    <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
-    <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/Directory.Build.props

@@ -1,6 +1,7 @@
 <Project>
-  <Import Project="..\version.props" />
-  <Import Project="..\build\common.props" />
-  <Import Project="..\build\external-dependencies.props" />
-  <Import Project="..\build\sources.props" />
+  <Import Project="..\Directory.Build.props" />
+
+  <ItemGroup>
+    <PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkPackageVersion)" PrivateAssets="All" />
+  </ItemGroup>
 </Project>

src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj

@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
-
   <PropertyGroup>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IncludeSymbols>false</IncludeSymbols>
@@ -9,9 +7,6 @@
     <PackageTags>aspnetcore</PackageTags>
     <Description>Microsoft.AspNetCore.All</Description>
     <EnableApiCheck>false</EnableApiCheck>
-
-    <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
-    <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/Microsoft.AspNetCore.Analyzers/Microsoft.AspNetCore.Analyzers.csproj

@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''" />
-
   <PropertyGroup>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IncludeSymbols>false</IncludeSymbols>

src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj

@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
-
   <PropertyGroup>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IncludeSymbols>false</IncludeSymbols>
@@ -9,9 +7,6 @@
     <PackageTags>aspnetcore</PackageTags>
     <Description>Microsoft.AspNetCore.App</Description>
     <EnableApiCheck>false</EnableApiCheck>
-
-    <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
-    <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
   </PropertyGroup>
 
   <ItemGroup>

test/SharedFx.UnitTests/AssertEx.cs

@@ -0,0 +1,35 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.IO;
+using Xunit.Sdk;
+
+namespace Microsoft.AspNetCore
+{
+    public class AssertEx
+    {
+        public static void DirectoryExists(string path)
+        {
+            if (!Directory.Exists(path))
+            {
+                throw new XunitException($"Expected directory to exist at {path} but it did not");
+            }
+        }
+
+        public static void FileExists(string path)
+        {
+            if (!File.Exists(path))
+            {
+                throw new XunitException($"Expected file to exist at {path} but it did not");
+            }
+        }
+
+        public static void FileDoesNotExists(string path)
+        {
+            if (File.Exists(path))
+            {
+                throw new XunitException($"File should not exist at {path}");
+            }
+        }
+    }
+}

test/SharedFx.UnitTests/SharedFx.UnitTests.csproj

@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <RootNamespace>Microsoft.AspNetCore</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
+      <_Parameter1>PackageVersion</_Parameter1>
+      <_Parameter2>$(PackageVersion)</_Parameter2>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
+      <_Parameter1>DotNetRoot</_Parameter1>
+      <_Parameter2>$(SharedFxOutputPath)</_Parameter2>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
+      <_Parameter1>SharedFxRuntimeIdentifier</_Parameter1>
+      <_Parameter2>$(SharedFxRuntimeIdentifier)</_Parameter2>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
+      <_Parameter1>RepositoryCommit</_Parameter1>
+      <_Parameter2>$(RepositoryCommit)</_Parameter2>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
+      <_Parameter1>MicrosoftNETCoreAppPackageVersion</_Parameter1>
+      <_Parameter2>$(MicrosoftNETCoreAppPackageVersion)</_Parameter2>
+    </AssemblyAttribute>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
+    <PackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersPackageVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualstudioPackageVersion)" />
+  </ItemGroup>
+
+</Project>

test/SharedFx.UnitTests/SharedFxTests.cs

@@ -0,0 +1,97 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.IO;
+using Newtonsoft.Json.Linq;
+using Xunit;
+
+namespace Microsoft.AspNetCore
+{
+    public class SharedFxTests
+    {
+        [Theory]
+        [MemberData(nameof(GetSharedFxConfig))]
+        public void ItContainsValidRuntimeConfigFile(SharedFxConfig config)
+        {
+            var root = TestData.GetDotNetRoot();
+            var dir = Path.Combine(root, "shared", config.Name, config.Version);
+            var runtimeConfigFilePath = Path.Combine(dir, config.Name + ".runtimeconfig.json");
+
+            AssertEx.FileExists(runtimeConfigFilePath);
+            AssertEx.FileDoesNotExists(Path.Combine(dir, config.Name + ".runtimeconfig.dev.json"));
+
+            var runtimeConfig = JObject.Parse(File.ReadAllText(runtimeConfigFilePath));
+
+            Assert.Equal(config.BaseSharedFxName, (string)runtimeConfig["runtimeOptions"]["framework"]["name"]);
+            Assert.Equal("netcoreapp" + config.Version.Substring(0, 3), (string)runtimeConfig["runtimeOptions"]["tfm"]);
+
+            Assert.Equal(config.BaseSharedFxVersion, (string)runtimeConfig["runtimeOptions"]["framework"]["version"]);
+        }
+
+        [Theory]
+        [MemberData(nameof(GetSharedFxConfig))]
+        public void ItContainsValidDepsJson(SharedFxConfig config)
+        {
+            var root = TestData.GetDotNetRoot();
+            var dir = Path.Combine(root, "shared", config.Name, config.Version);
+            var depsFilePath = Path.Combine(dir, config.Name + ".deps.json");
+
+            var target = $".NETCoreApp,Version=v{config.Version.Substring(0, 3)}/{config.RuntimeIdentifier}";
+
+            AssertEx.FileExists(depsFilePath);
+
+            var depsFile = JObject.Parse(File.ReadAllText(depsFilePath));
+
+            Assert.Equal(target, (string)depsFile["runtimeTarget"]["name"]);
+            Assert.NotNull(depsFile["targets"][target]);
+            Assert.NotNull(depsFile["compilationOptions"]);
+            Assert.Empty(depsFile["compilationOptions"]);
+            Assert.NotEmpty(depsFile["runtimes"][config.RuntimeIdentifier]);
+        }
+
+        [Theory]
+        [MemberData(nameof(GetSharedFxConfig))]
+        public void ItContainsVersionFile(SharedFxConfig config)
+        {
+            var root = TestData.GetDotNetRoot();
+            var versionFile = Path.Combine(root, "shared", config.Name, config.Version, ".version");
+            AssertEx.FileExists(versionFile);
+            var lines = File.ReadAllLines(versionFile);
+            Assert.Equal(2, lines.Length);
+            Assert.Equal(TestData.GetRepositoryCommit(), lines[0]);
+            Assert.Equal(config.Version, lines[1]);
+        }
+
+
+        public static TheoryData<SharedFxConfig> GetSharedFxConfig()
+            => new TheoryData<SharedFxConfig>
+            {
+                new SharedFxConfig
+                {
+                    Name = "Microsoft.AspNetCore.All",
+                    Version = TestData.GetPackageVersion(),
+                    // Intentionally assert aspnetcore frameworks align versions with each other and netcore
+                    BaseSharedFxVersion = TestData.GetPackageVersion(),
+                    BaseSharedFxName = "Microsoft.AspNetCore.App",
+                    RuntimeIdentifier = TestData.GetSharedFxRuntimeIdentifier(),
+                },
+                new SharedFxConfig
+                {
+                    Name = "Microsoft.AspNetCore.App",
+                    Version = TestData.GetPackageVersion(),
+                    BaseSharedFxName = "Microsoft.NETCore.App",
+                    BaseSharedFxVersion = TestData.GetMicrosoftNETCoreAppPackageVersion(),
+                    RuntimeIdentifier = TestData.GetSharedFxRuntimeIdentifier(),
+                },
+            };
+
+        public class SharedFxConfig
+        {
+            public string Name { get; set; }
+            public string Version { get; set; }
+            public string BaseSharedFxName { get; set; }
+            public string BaseSharedFxVersion { get; set; }
+            public string RuntimeIdentifier { get; set; }
+        }
+    }
+}

test/SharedFx.UnitTests/TestData.cs

@@ -0,0 +1,24 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Linq;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore
+{
+    public class TestData
+    {
+        public static string GetPackageVersion() => GetTestDataValue("PackageVersion");
+
+        public static string GetMicrosoftNETCoreAppPackageVersion() => GetTestDataValue("MicrosoftNETCoreAppPackageVersion");
+
+        public static string GetDotNetRoot() => GetTestDataValue("DotNetRoot");
+
+        public static string GetRepositoryCommit() => GetTestDataValue("RepositoryCommit");
+
+        public static string GetSharedFxRuntimeIdentifier() => GetTestDataValue("SharedFxRuntimeIdentifier");
+
+        private static string GetTestDataValue(string key)
+             => typeof(TestData).Assembly.GetCustomAttributes<TestDataAttribute>().Single(d => d.Key == key).Value;
+    }
+}

test/SharedFx.UnitTests/TestDataAttribute.cs

@@ -0,0 +1,20 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore
+{
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+    internal class TestDataAttribute : Attribute
+    {
+        public TestDataAttribute(string key, string value)
+        {
+            Key = key;
+            Value = value;
+        }
+
+        public string Key { get; }
+        public string Value { get; }
+    }
+}

version.props

@@ -5,6 +5,7 @@
     <AspNetCorePatchVersion>0</AspNetCorePatchVersion>
     <VersionPrefix>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion)</VersionPrefix>
     <PrereleaseVersionLabel>preview1</PrereleaseVersionLabel>
+    <BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
 
     <!-- The 'human friendly' version to display in installers. In pre-release builds, this might be "2.0.7 Preview 2" -->
     <PackageBrandingVersion>$(VersionPrefix) Preview 1</PackageBrandingVersion>