Move common properties to Directory.Build.props

Also remove obsolete unused test project.
sillsdev · Jan 5, 2022 · f38166a · f38166a
1 parent dc2f89f
commit f38166a
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 58 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -16,6 +16,7 @@
 *.vcxproj -whitespace
 *.vcxproj.filters -whitespace
 *.patch -whitespace
+*.props -whitespace
 *.svg -whitespace
 *.xml -whitespace
 *.yml -whitespace

diff --git a/source/Directory.Build.props b/source/Directory.Build.props
@@ -0,0 +1,25 @@
+<Project>
+  <PropertyGroup>
+    <TargetFrameworks>net40;net451;netstandard1.6</TargetFrameworks>
+    <PlatformAlias>netstandard</PlatformAlias>
+    <OutputPath>$(MSBuildThisFileDirectory)\..\output\$(Configuration)</OutputPath>
+    <PackageOutputPath>$(MSBuildThisFileDirectory)\..\output</PackageOutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Company>SIL International</Company>
+    <Authors>SIL International</Authors>
+    <Copyright>Copyright © 2007-2022 SIL International</Copyright>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/sillsdev/icu-dotnet</PackageProjectUrl>
+    <AppendToReleaseNotesProperty><![CDATA[
+See full changelog at https://github.com/sillsdev/icu-dotnet/blob/master/CHANGELOG.md.]]>
+    </AppendToReleaseNotesProperty>
+    <ChangelogFile>$(MSBuildThisFileDirectory)/../CHANGELOG.md</ChangelogFile>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <LangVersion>7.1</LangVersion>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)/icu.net.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+</Project>
diff --git a/source/icu.net.netstandard.testrunner/icu.net.netstandard.testrunner.csproj b/source/icu.net.netstandard.testrunner/icu.net.netstandard.testrunner.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
+    <TargetFrameworks/> <!-- override value from Directory.Build.props -->
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <OutputPath>../../output/$(Configuration)</OutputPath>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/source/icu.net.netstandard.tests/icu.net.netstandard.tests.csproj b/source/icu.net.netstandard.tests/icu.net.netstandard.tests.csproj
diff --git a/source/icu.net/icu.net.snk → source/icu.net.snk b/source/icu.net/icu.net.snk → source/icu.net.snk
diff --git a/source/icu.net.tests/icu.net.tests.csproj b/source/icu.net.tests/icu.net.tests.csproj
@@ -2,13 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
     <RootNamespace>Icu.Tests</RootNamespace>
-    <Configurations>Debug;Release</Configurations>
-    <OutputPath>../../output/$(Configuration)</OutputPath>
     <AssemblyTitle>icu.net.tests</AssemblyTitle>
-    <Company>SIL</Company>
-    <Copyright>Copyright © 2018-2022 SIL International</Copyright>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
     <IsPackable>false</IsPackable>
     <LangVersion>8</LangVersion>
   </PropertyGroup>

diff --git a/source/icu.net/icu.net.csproj b/source/icu.net/icu.net.csproj
@@ -1,33 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net40;net451;netstandard1.6</TargetFrameworks>
-    <PlatformAlias>netstandard</PlatformAlias>
-    <OutputPath>..\..\output\$(Configuration)</OutputPath>
-    <PackageOutputPath>..\..\output</PackageOutputPath>
     <RootNamespace>Icu</RootNamespace>
     <AssemblyName>icu.net</AssemblyName>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Company>SIL International</Company>
-    <Authors>SIL International</Authors>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/sillsdev/icu-dotnet</PackageProjectUrl>
-    <Copyright>Copyright © 2007-2022 SIL International</Copyright>
     <Description>icu.net is a C# Wrapper around ICU4C
 
 This version of icu.net works with (more or less) any version of ICU4C.
 
 NOTE: this package contains the managed wrapper part of icu.net. You'll also have to have the unmanaged binaries of ICU installed. On Linux it is recommended to install the official ICU package that comes with the system. On Windows you can install one of the binary nuget packages, e.g. Icu4c.Win.</Description>
-    <AppendToReleaseNotesProperty><![CDATA[
-See full changelog at https://github.com/sillsdev/icu-dotnet/blob/master/CHANGELOG.md.]]>
-    </AppendToReleaseNotesProperty>
-    <ChangelogFile>../../CHANGELOG.md</ChangelogFile>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <LangVersion>7.1</LangVersion>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>icu.net.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <!-- Full .NET Framework properties -->
   <PropertyGroup Condition="'$(TargetFramework)' != 'netstandard1.6'">