Move common properties to Directory.Build.props

sillsdev · Sep 8, 2022 · ef50719 · ef50719
1 parent 3bd4721
commit ef50719
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 71 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,26 @@
+<Project>
+  <PropertyGroup>
+    <TargetFrameworks>net461;netstandard2.0;net5.0</TargetFrameworks>
+    <RootNamespace>SIL.IDLImporterTool</RootNamespace>
+    <Configurations>Debug;Release</Configurations>
+    <Company>SIL International</Company>
+    <Authors>SIL International</Authors>
+    <Product>IDLImporter</Product>
+    <Copyright>Copyright © 2002-2022 SIL International</Copyright>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/sillsdev/IdlImporter</PackageProjectUrl>
+    <OutputPath>$(MSBuildThisFileDirectory)/output/$(Configuration)/</OutputPath>
+    <PackageOutputPath>$(MSBuildThisFileDirectory)/output</PackageOutputPath>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)/idlimp.snk</AssemblyOriginatorKeyFile>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <AppendToReleaseNotesProperty><![CDATA[
+See full changelog at https://github.com/sillsdev/IdlImporter/blob/master/CHANGELOG.md]]>
+    </AppendToReleaseNotesProperty>
+    <ChangelogFile>$(MSBuildThisFileDirectory)/CHANGELOG.md</ChangelogFile>
+    <NoWarn>1591</NoWarn>
+    <UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
+  </PropertyGroup>
+</Project>
diff --git a/IDLImporter/IDLImporter.csproj b/IDLImporter/IDLImporter.csproj
@@ -1,33 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netstandard2.0;net5.0</TargetFrameworks>
-    <RootNamespace>SIL.IdlImporterTool</RootNamespace>
     <AssemblyTitle>IDLImporter</AssemblyTitle>
-    <Configurations>Debug;Release</Configurations>
+    <PackageId>SIL.IdlImporter</PackageId>
     <Description>Imports the COM interfaces from an IDL file for use with .NET. Can handle
       c-style arrays and OLECHAR pointers.</Description>
-    <Company>SIL International</Company>
-    <Authors>SIL International</Authors>
-    <Product>IDLImporter</Product>
-    <Copyright>Copyright © 2002-2021 SIL International</Copyright>
-    <PackageId>SIL.IdlImporter</PackageId>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/sillsdev/IdlImporter</PackageProjectUrl>
-    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <OutputPath>../output/$(Configuration)/</OutputPath>
-    <PackageOutputPath>../output</PackageOutputPath>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>../idlimp.snk</AssemblyOriginatorKeyFile>
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <AppendToReleaseNotesProperty><![CDATA[
-See full changelog at https://github.com/sillsdev/IdlImporter/blob/master/CHANGELOG.md]]>
-    </AppendToReleaseNotesProperty>
-    <ChangelogFile>../CHANGELOG.md</ChangelogFile>
-    <NoWarn>1591</NoWarn>
-    <UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/IDLImporterTests/IDLImporterTests.csproj b/IDLImporterTests/IDLImporterTests.csproj
@@ -2,32 +2,8 @@
 
   <PropertyGroup>
     <TargetFrameworks>net461</TargetFrameworks>
-    <RootNamespace>SIL.IDLImporterTool</RootNamespace>
     <AssemblyTitle>IDLImporterTests</AssemblyTitle>
-    <Configurations>Debug;Release</Configurations>
-    <Description>Imports the COM interfaces from an IDL file for use with .NET. Can handle
-      c-style arrays and OLECHAR pointers.</Description>
-    <Company>SIL International</Company>
-    <Authors>SIL International</Authors>
-    <Product>IDLImporter</Product>
-    <Copyright>Copyright © 2002-2021 SIL International</Copyright>
     <PackageId>SIL.IdlImporter.Tests</PackageId>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/sillsdev/IdlImporter</PackageProjectUrl>
-    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <OutputPath>../output/$(Configuration)</OutputPath>
-    <PackageOutputPath>../output</PackageOutputPath>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>../idlimp.snk</AssemblyOriginatorKeyFile>
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <AppendToReleaseNotesProperty><![CDATA[
-See full changelog at https://github.com/sillsdev/IdlImporter/blob/master/CHANGELOG.md]]>
-    </AppendToReleaseNotesProperty>
-    <ChangelogFile>../CHANGELOG.md</ChangelogFile>
-    <NoWarn>1591</NoWarn>
-    <UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/IdlImpTool/IDLImp.cs b/IdlImpTool/IDLImp.cs
@@ -20,7 +20,7 @@ public class IDLImpConsole
 		private static void ShowHelp()
 		{
 			System.Console.WriteLine("\nIDLImporter. Creates .NET interfaces from an IDL file.");
-			System.Console.WriteLine("Copyright (c) 2002-2015, SIL International. All Rights Reserved.\n");
+			System.Console.WriteLine("Copyright (c) 2002-2022, SIL International. All Rights Reserved.\n");
 			System.Console.WriteLine("Syntax: {0} [options] file.idl",
 				Path.GetFileName(Path.GetFileName(Assembly.GetEntryAssembly().Location)));
 			System.Console.WriteLine("possible options:");

diff --git a/IdlImpTool/IDLImp.csproj b/IdlImpTool/IDLImp.csproj
@@ -4,34 +4,14 @@
     <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifiers>win10-x64;linux-x64</RuntimeIdentifiers>
-    <RootNamespace>SIL.FieldWorks.Tools</RootNamespace>
     <AssemblyTitle>IDLImp</AssemblyTitle>
-    <Configurations>Debug;Release</Configurations>
     <Description>Imports the COM interfaces from an IDL file for use with .NET. Can handle c-style arrays and OLECHAR pointers.</Description>
-    <Company>SIL International</Company>
-    <Authors>SIL International</Authors>
-    <Product>IDLImporter</Product>
-    <Copyright>Copyright © 2002-2022 SIL International</Copyright>
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>idlimport</ToolCommandName>
     <PackageId>SIL.IdlImporter.Tool</PackageId>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/sillsdev/IdlImporter</PackageProjectUrl>
-    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageOutputPath>../output</PackageOutputPath>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>../idlimp.snk</AssemblyOriginatorKeyFile>
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <AppendToReleaseNotesProperty><![CDATA[
-See full changelog at https://github.com/sillsdev/IdlImporter/blob/master/CHANGELOG.md]]>
-    </AppendToReleaseNotesProperty>
-    <ChangelogFile>../CHANGELOG.md</ChangelogFile>
-    <NoWarn>1591</NoWarn>
-    <UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
-    <IsPackable>true</IsPackable>
+    <OutputPath>$(MSBuildThisFileDirectory)/bin/$(Configuration)/</OutputPath>
   </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
     <PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="All" />