Centralize some property and fix Extensions.Config

6 years ago · b92ea3870c
9 changed files with 14 additions and 14 deletions
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -3,14 +3,9 @@

  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />

-  <!-- 
-  
-    TODO come back here for copyright as part of #4 
-  
  <PropertyGroup Condition="'$(CopyrightNetFoundation)' != ''">
    <Copyright>$(CopyrightNetFoundation)</Copyright>
  </PropertyGroup>
-  -->

  <PropertyGroup>
    <PackageLicenseExpression>MIT</PackageLicenseExpression>
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@ -0,0 +1,7 @@
+<Project>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
+
+  <PropertyGroup>
+    <IsPackable>true</IsPackable>
+  </PropertyGroup>
+</Project>
--- a/src/Microsoft.Tye.Core/Microsoft.Tye.Core.csproj
+++ b/src/Microsoft.Tye.Core/Microsoft.Tye.Core.csproj
@ -5,9 +5,6 @@
    <RootNamespace>Tye</RootNamespace>
    <AssemblyName>Microsoft.Tye.Core</AssemblyName>
    <PackageId>Microsoft.Tye.Core</PackageId>
-    <LangVersion>8.0</LangVersion>
-    <Nullable>Enable</Nullable>
-    <IsPackable>true</IsPackable>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Microsoft.Tye.Hosting.Diagnostics/Microsoft.Tye.Hosting.Diagnostics.csproj
+++ b/src/Microsoft.Tye.Hosting.Diagnostics/Microsoft.Tye.Hosting.Diagnostics.csproj
@ -6,7 +6,6 @@
    <AssemblyName>Microsoft.Tye.Hosting.Diagnostics</AssemblyName>
    <PackageId>Microsoft.Tye.Hosting.Diagnostics</PackageId>
    <Nullable>disable</Nullable>
-    <IsPackable>true</IsPackable>
  </PropertyGroup>

  <ItemGroup Label="Pinned">
--- a/src/Microsoft.Tye.Hosting.Runtime/Microsoft.Tye.Hosting.Runtime.csproj
+++ b/src/Microsoft.Tye.Hosting.Runtime/Microsoft.Tye.Hosting.Runtime.csproj
@ -6,7 +6,6 @@
    <AssemblyName>Microsoft.Tye.Hosting.Runtime</AssemblyName>
    <PackageId>Microsoft.Tye.Hosting.Runtime</PackageId>
    <Nullable>disable</Nullable>
-    <IsPackable>true</IsPackable>
  </PropertyGroup>

 </Project>
--- a/src/Microsoft.Tye.Hosting/Microsoft.Tye.Hosting.csproj
+++ b/src/Microsoft.Tye.Hosting/Microsoft.Tye.Hosting.csproj
@ -8,8 +8,6 @@
    <PackageId>Microsoft.Tye.Hosting</PackageId>
    <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
    <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
-    <Nullable>enable</Nullable>
-    <IsPackable>true</IsPackable>
  </PropertyGroup>

  <ItemGroup>
--- a/src/tye/tye.csproj
+++ b/src/tye/tye.csproj
@ -8,7 +8,6 @@
    <PackageId>Microsoft.Tye</PackageId>
    <ToolCommandName>tye</ToolCommandName>
    <PackAsTool>true</PackAsTool>
-    <IsPackable>true</IsPackable>
  </PropertyGroup>

  <ItemGroup>
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@ -0,0 +1,7 @@
+<Project>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
+
+  <PropertyGroup>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+</Project>
--- a/test/E2ETest/E2ETest.csproj
+++ b/test/E2ETest/E2ETest.csproj
@ -5,7 +5,6 @@
    <AssemblyName>Microsoft.Tye.E2ETest</AssemblyName>
    <IsTestProject>true</IsTestProject>
    <IsUnitTestProject>true</IsUnitTestProject>
-    <IsPackable>false</IsPackable>
    <TestRunnerName>XUnit</TestRunnerName>
  </PropertyGroup>