Add Directory.Build.Props

majorsilence · Nov 30, 2024 · f48d3e7 · f48d3e7
1 parent bdef50b
commit f48d3e7
Show file tree

Hide file tree

Showing 23 changed files with 21 additions and 129 deletions.
diff --git a/DataProviders/DataProviders.csproj b/DataProviders/DataProviders.csproj
@@ -10,15 +10,8 @@
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<AssemblyTitle>RDL Data Providers</AssemblyTitle>
 		<Description></Description>
-		<Company>fyiReporting Software, LLC</Company>
-		<Product>RDL Project</Product>
-		<Copyright>Copyright (C) 2004-2008  fyiReporting Software, LLC</Copyright>
-		<AssemblyVersion>4.18.0</AssemblyVersion>
-		<Version>4.18.0</Version>
 		<DelaySign>false</DelaySign>
 		<PackageId>Majorsilence.Reporting.DataProviders</PackageId>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Deterministic>true</Deterministic>
 	</PropertyGroup>
 	<ItemGroup>
 		<Reference Update="System">

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,20 @@
+<Project>
+  <PropertyGroup>
+    <Deterministic>true</Deterministic>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+    <RepositoryUrl>https://github.com/majorsilence/My-FyiReporting</RepositoryUrl>
+    <AssemblyVersion>4.18.0</AssemblyVersion>
+    <FileVersion>4.18.0</FileVersion>
+    <Version>4.18.0</Version>
+    <Deterministic>true</Deterministic>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+    <Product>Majorsilence Reporting</Product>
+    <Copyright>Copyright © 2004-2008  fyiReporting Software, LLC, Majorsilence Reporting Devs 2024</Copyright>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
+    <DebugSymbols>False</DebugSymbols>
+    <DebugType>None</DebugType>
+  </PropertyGroup>
+</Project>
diff --git a/EncryptionProvider/EncryptionProvider.csproj b/EncryptionProvider/EncryptionProvider.csproj
@@ -7,14 +7,7 @@
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<AssemblyTitle>EncryptionProvider</AssemblyTitle>
 		<Description></Description>
-		<Company></Company>
-		<Product>EncryptionProvider</Product>
-		<Copyright>Copyright ©  2015</Copyright>
-		<AssemblyVersion>4.17.0</AssemblyVersion>
-		<Version>4.17.0</Version>
 		<PackageId>Majorsilence.Reporting.EncryptionProvider</PackageId>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Deterministic>true</Deterministic>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="System.Data.DataSetExtensions" />

diff --git a/LibRdlCrossPlatformViewer/LibRdlCrossPlatformViewer.csproj b/LibRdlCrossPlatformViewer/LibRdlCrossPlatformViewer.csproj
@@ -5,15 +5,8 @@
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<AssemblyTitle>LibRdlCrossPlatformViewer</AssemblyTitle>
 		<Description></Description>
-		<Company></Company>
-		<Product>LibRdlCrossPlatformViewer</Product>
-		<Copyright>Copyright ©  2012</Copyright>
-		<AssemblyVersion>4.18.0</AssemblyVersion>
-		<Version>4.18.0</Version>
 		<DelaySign>false</DelaySign>
 		<PackageId>Majorsilence.Reporting.LibRdlCrossPlatformViewer</PackageId>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Deterministic>true</Deterministic>
 	</PropertyGroup>
 	<ItemGroup>
 		<Reference Include="Xwt">

diff --git a/LibRdlWpfViewer/LibRdlWpfViewer.csproj b/LibRdlWpfViewer/LibRdlWpfViewer.csproj
@@ -8,15 +8,8 @@
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<AssemblyTitle>RDL Data WPF Library</AssemblyTitle>
 		<Description></Description>
-		<Company></Company>
-		<Product>RDL Data WPF Library</Product>
-		<Copyright>Copyright © 2012 Peter Gill</Copyright>
-		<AssemblyVersion>4.18.0</AssemblyVersion>
-		<Version>4.18.0</Version>
 		<DelaySign>false</DelaySign>
 		<PackageId>Majorsilence.Reporting.LibRdlWpfViewer</PackageId>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Deterministic>true</Deterministic>
 	</PropertyGroup>
 	<ItemGroup>
 		<Reference Update="System.Core">

diff --git a/RdlAsp.Mvc/RdlAsp.Mvc.csproj b/RdlAsp.Mvc/RdlAsp.Mvc.csproj
@@ -11,15 +11,9 @@
     <AssemblyTitle>RDL ASP</AssemblyTitle>
     <Description>
     </Description>
-    <Company>fyiReporting Software, LLC</Company>
-    <Product>RDL Project</Product>
-    <Copyright>Copyright (C) 2004-2008  fyiReporting Software, LLC</Copyright>
-    <AssemblyVersion>4.18.0</AssemblyVersion>
-    <Version>4.18.0</Version>
     <DelaySign>false</DelaySign>
     <PackageId>Majorsilence.Reporting.RdlAsp.Mvc</PackageId>
 	<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
-	<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
     <Reference Update="System.Data">

diff --git a/RdlAsp/RdlAsp.csproj b/RdlAsp/RdlAsp.csproj
@@ -9,11 +9,6 @@
 	<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 	<AssemblyTitle>RDL ASP</AssemblyTitle>
 	<Description></Description>
-	<Company>fyiReporting Software, LLC</Company>
-	<Product>RDL Project</Product>
-	<Copyright>Copyright (C) 2004-2008  fyiReporting Software, LLC</Copyright>
-	<AssemblyVersion>4.18.0</AssemblyVersion>
-	<Version>4.18.0</Version>
 	<DelaySign>false</DelaySign>
     <PackageId>Majorsilence.Reporting.RdlAsp</PackageId>
   </PropertyGroup>
@@ -41,6 +36,5 @@
   <PropertyGroup />
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 </Project>
diff --git a/RdlCmd/RdlCmd.csproj b/RdlCmd/RdlCmd.csproj
@@ -7,11 +7,7 @@
 		<OutputType>Exe</OutputType>
 		<RootNamespace>fyiReporting.RdlCmd</RootNamespace>
 		<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Deterministic>true</Deterministic>
 		<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-		<AssemblyVersion>4.18.0</AssemblyVersion>
-		<Version>4.18.0</Version>
 	</PropertyGroup>
 	<ItemGroup>
 		<Reference Update="System">

diff --git a/RdlCreator.Tests/RdlCreator.Tests.csproj b/RdlCreator.Tests/RdlCreator.Tests.csproj
@@ -4,10 +4,6 @@
 		<TargetFramework>net6.0-windows</TargetFramework>
 		<RootNamespace>fyiReporting.RdlCreator.Tests</RootNamespace>
 		<AssemblyName>RdlCreator.Tests</AssemblyName>
-		<AssemblyVersion>4.18.0</AssemblyVersion>
-		<Version>4.18.0</Version>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Deterministic>true</Deterministic>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/RdlCreator/RdlCreator.csproj b/RdlCreator/RdlCreator.csproj
@@ -4,12 +4,8 @@
 		<TargetFrameworks>net48;net6.0</TargetFrameworks>
 		<RootNamespace>fyiReporting.RdlCreator</RootNamespace>
 		<AssemblyName>RdlCreator</AssemblyName>
-		<AssemblyVersion>4.18.0</AssemblyVersion>
-		<Version>4.18.0</Version>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<PackageId>Majorsilence.Reporting.RdlCreator</PackageId>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Deterministic>true</Deterministic>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\DataProviders\DataProviders.csproj" />

diff --git a/RdlCri/RdlCri.csproj b/RdlCri/RdlCri.csproj
@@ -7,15 +7,8 @@
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
         <AssemblyTitle>RdlCri</AssemblyTitle>
         <Description>RDL Project CustomReportItem Library</Description>
-        <Company>fyiReporting Software, LLC</Company>
-        <Product>CRI</Product>
-        <Copyright>Copyright © 2006-2008</Copyright>
-        <AssemblyVersion>4.18.0</AssemblyVersion>
-        <Version>4.18.0</Version>
         <DelaySign>false</DelaySign>
         <PackageId>Majorsilence.Reporting.RdlCri</PackageId>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Deterministic>true</Deterministic>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\RdlEngine\RdlEngine.csproj" />

diff --git a/RdlDesign/ReportDesigner.csproj b/RdlDesign/ReportDesigner.csproj
@@ -14,15 +14,8 @@
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<AssemblyTitle>RDL Designer</AssemblyTitle>
 		<Description></Description>
-		<Company>fyiReporting Software, LLC</Company>
-		<Product>RDL Project</Product>
-		<Copyright>Copyright (C) 2004-2008  fyiReporting Software, LLC</Copyright>
-		<AssemblyVersion>4.18.0</AssemblyVersion>
-		<Version>4.18.0</Version>
 		<DelaySign>false</DelaySign>
 		<PackageId>Majorsilence.Reporting.ReportDesigner</PackageId>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Deterministic>true</Deterministic>
 	</PropertyGroup>
 	<ItemGroup>
 		<Reference Update="System">

diff --git a/RdlDesktop/RdlDesktop.csproj b/RdlDesktop/RdlDesktop.csproj
@@ -8,10 +8,6 @@
 		<RootNamespace>fyiReporting.RdlDesktop</RootNamespace>
 		<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
 		<StartupObject>fyiReporting.RdlDesktop.RdlDesktop</StartupObject>
-		<AssemblyVersion>4.18.0</AssemblyVersion>
-		<Version>4.18.0</Version>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Deterministic>true</Deterministic>
 		<TargetFrameworks>net48;net6.0</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>

diff --git a/RdlEngine/RdlEngine.csproj b/RdlEngine/RdlEngine.csproj
@@ -10,15 +10,8 @@
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<AssemblyTitle>RDL Engine</AssemblyTitle>
 		<Description></Description>
-		<Company>fyiReporting Software, LLC</Company>
-		<Product>RDL Engine</Product>
-		<Copyright>Copyright (C) 2004-2008  fyiReporting Software, LLC</Copyright>
-		<AssemblyVersion>4.18.0</AssemblyVersion>
-		<Version>4.18.0</Version>
 		<DelaySign>false</DelaySign>
 		<PackageId>Majorsilence.Reporting.RdlEngine</PackageId>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Deterministic>true</Deterministic>
 	</PropertyGroup>
 	<ItemGroup>
 		<Reference Update="System">

diff --git a/RdlGtk3/RdlGtk3.csproj b/RdlGtk3/RdlGtk3.csproj
@@ -5,10 +5,6 @@
 		<OutputType>Library</OutputType>
 		<RootNamespace>fyiReporting.RdlGtk3</RootNamespace>
 		<AssemblyName>RdlGtk3</AssemblyName>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Deterministic>true</Deterministic>
-		<AssemblyVersion>4.18.0</AssemblyVersion>
-		<Version>4.18.0</Version>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<PackageId>Majorsilence.Reporting.RdlGtk3</PackageId>
 	</PropertyGroup>

diff --git a/RdlGtk3Viewer/RdlGtk3Viewer.csproj b/RdlGtk3Viewer/RdlGtk3Viewer.csproj
@@ -6,10 +6,6 @@
 		<OutputType>WinExe</OutputType>
 		<RootNamespace>fyiReporting.RdlGtk3Viewer</RootNamespace>
 		<AssemblyName>RdlGtk3Viewer</AssemblyName>
-		<AssemblyVersion>4.18.0</AssemblyVersion>
-		<Version>4.18.0</Version>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Deterministic>true</Deterministic>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/RdlMapFile/RdlMapFile.csproj b/RdlMapFile/RdlMapFile.csproj
@@ -3,13 +3,9 @@
 		<TargetFrameworks>net48;net6.0-windows</TargetFrameworks>
 		<OutputType>WinExe</OutputType>
 		<ApplicationIcon>App.ico</ApplicationIcon>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 		<UseWindowsForms>true</UseWindowsForms>
 		<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-		<Deterministic>true</Deterministic>
 		<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
-		<AssemblyVersion>4.18.0</AssemblyVersion>
-		<Version>4.18.0</Version>
 	</PropertyGroup>
 	<ItemGroup>
 		<Compile Update="DesignXmlDraw.cs">

diff --git a/RdlReader/RdlReader.csproj b/RdlReader/RdlReader.csproj
@@ -7,13 +7,9 @@
 		<DelaySign>false</DelaySign>
 		<OutputType>WinExe</OutputType>
 		<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 		<UseWindowsForms>true</UseWindowsForms>
 		<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-		<Deterministic>true</Deterministic>
 		<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
-		<AssemblyVersion>4.17.0</AssemblyVersion>
-		<Version>4.17.0</Version>
 	</PropertyGroup>
 	<ItemGroup>
 		<Reference Update="System">

diff --git a/RdlViewer.Tests/RdlViewer.Tests.csproj b/RdlViewer.Tests/RdlViewer.Tests.csproj
@@ -2,12 +2,8 @@
 	<PropertyGroup>
 		<TargetFramework>net6.0-windows</TargetFramework>
 		<OutputType>Library</OutputType>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Deterministic>true</Deterministic>
 		<UseWindowsForms>true</UseWindowsForms>
 		<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-		<AssemblyVersion>4.18.0</AssemblyVersion>
-		<Version>4.18.0</Version>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\RdlCri\RdlCri.csproj" />

diff --git a/RdlViewer/RdlViewer.csproj b/RdlViewer/RdlViewer.csproj
@@ -13,15 +13,8 @@
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<AssemblyTitle>RDL Viewer</AssemblyTitle>
 		<Description></Description>
-		<Company>fyiReporting Software, LLC</Company>
-		<Product>RDL Project</Product>
-		<Copyright>Copyright (C) 2004-2008  fyiReporting Software, LLC</Copyright>
-		<AssemblyVersion>4.18.0</AssemblyVersion>
-		<Version>4.18.0</Version>
 		<DelaySign>false</DelaySign>
 		<PackageId>Majorsilence.Reporting.RdlViewer</PackageId>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Deterministic>true</Deterministic>
 	</PropertyGroup>
 	<ItemGroup>
 		<Compile Remove="RdlReader\bin\**" />

diff --git a/Release-Builds/prepare-files-for-release.bat b/Release-Builds/prepare-files-for-release.bat
@@ -3,24 +3,4 @@ REM Increment minor number by 1
 REM See http://www.codeproject.com/Articles/31236/How-To-Update-Assembly-Version-Number-Automaticall
 REM See https://github.com/TownSuite/AssemblyInfoUtil
 
-.\tools\AssemblyInfoUtil.exe -inc:2 "%CD%\..\DataProviders\DataProviders.csproj"
-.\tools\AssemblyInfoUtil.exe -inc:2 "%CD%\..\LibRdlCrossPlatformViewer\LibRdlCrossPlatformViewer.csproj"
-.\tools\AssemblyInfoUtil.exe -inc:2 "%CD%\..\LibRdlWpfViewer\LibRdlWpfViewer.csproj"
-.\tools\AssemblyInfoUtil.exe -inc:2 "%CD%\..\RdlAsp\RdlAsp.csproj"
-.\tools\AssemblyInfoUtil.exe -inc:2 "%CD%\..\RdlCmd\RdlCmd.csproj"
-.\tools\AssemblyInfoUtil.exe -inc:2 "%CD%\..\RdlCri\RdlCri.csproj"
-.\tools\AssemblyInfoUtil.exe -inc:2 "%CD%\..\RdlDesign\ReportDesigner.csproj"
-.\tools\AssemblyInfoUtil.exe -inc:2 "%CD%\..\RdlDesktop\RdlDesktop.csproj"
-.\tools\AssemblyInfoUtil.exe -inc:2 "%CD%\..\RdlEngine\RdlEngine.csproj"
-.\tools\AssemblyInfoUtil.exe -inc:2 "%CD%\..\RdlGtkViewer\RdlGtkViewer\AssemblyInfo.cs"
-.\tools\AssemblyInfoUtil.exe -inc:2 "%CD%\..\RdlMapFile\RdlMapFile.csproj"
-.\tools\AssemblyInfoUtil.exe -inc:2 "%CD%\..\RdlViewer\RdlViewer.csproj"
-.\tools\AssemblyInfoUtil.exe -inc:2 "%CD%\..\RdlViewer.Tests\RdlViewer.Tests.csproj"
-.\tools\AssemblyInfoUtil.exe -inc:2 "%CD%\..\RdlViewer\RdlReader\RdlViewer.csproj"
-.\tools\AssemblyInfoUtil.exe -inc:2 "%CD%\..\ReportServer\Properties\AssemblyInfo.cs"
-.\tools\AssemblyInfoUtil.exe -inc:2 "%CD%\..\RdlCreator\RdlCreator.csproj"
-.\tools\AssemblyInfoUtil.exe -inc:2 "%CD%\..\RdlCreator.Tests\RdlCreator.Tests.csproj"
-.\tools\AssemblyInfoUtil.exe -inc:2 "%CD%\..\RdlGtk3\RdlGtk3.csproj"
-.\tools\AssemblyInfoUtil.exe -inc:2 "%CD%\..\RdlGtk3Viewer\RdlGtk3Viewer.csproj"
-
-
+.\tools\AssemblyInfoUtil.exe -inc:2 "%CD%\..\Directory.Build.props"
diff --git a/Release-Builds/tools/AssemblyInfoUtil.exe b/Release-Builds/tools/AssemblyInfoUtil.exe
diff --git a/ReportTests/ReportTests.csproj b/ReportTests/ReportTests.csproj
@@ -2,12 +2,8 @@
 	<PropertyGroup>
 		<TargetFramework>net6.0-windows</TargetFramework>
 		<OutputType>Library</OutputType>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 		<UseWindowsForms>true</UseWindowsForms>
 		<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-		<Deterministic>true</Deterministic>
-		<AssemblyVersion>4.17.0</AssemblyVersion>
-		<Version>4.17.0</Version>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\DataProviders\DataProviders.csproj" />