Added Directory.Build.(props|targets)

2022-09-30 00:37:47 +02:00
parent 36ddaf02ad
commit e8a1378f60
10 changed files with 82 additions and 90 deletions
--- a/AMWD.Common.AspNetCore/AMWD.Common.AspNetCore.csproj
+++ b/AMWD.Common.AspNetCore/AMWD.Common.AspNetCore.csproj
@@ -1,36 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <Configurations>Debug;Release;DebugLocal</Configurations>
    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
    <LangVersion>10.0</LangVersion>

    <AssemblyName>AMWD.Common.AspNetCore</AssemblyName>
    <RootNamespace>AMWD.Common.AspNetCore</RootNamespace>
-    <NrtRevisionFormat>{semvertag:main}{!:-dirty}</NrtRevisionFormat>
-
-    <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
-    <CopyRefAssembliesToPublishDirectory>false</CopyRefAssembliesToPublishDirectory>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>

    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <EmbedUntrackedSources>false</EmbedUntrackedSources>
-
    <PackageId>AMWD.Common.AspNetCore</PackageId>
    <PackageIcon>icon.png</PackageIcon>
-    <PackageProjectUrl>https://wiki.am-wd.de/libs/common</PackageProjectUrl>
-
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://git.am-wd.de/AM.WD/common.git</RepositoryUrl>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>

    <Product>AM.WD Common Library for ASP.NET Core</Product>
-    <Description>Library with classes and extensions used frequently on AM.WD projects.</Description>
-    <Company>AM.WD</Company>
-    <Authors>Andreas Müller</Authors>
-    <Copyright>© {copyright:2020-} AM.WD</Copyright>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
  </PropertyGroup>

  <PropertyGroup Condition="'$(GITLAB_CI)' == 'true'">
--- a/AMWD.Common.EntityFrameworkCore/AMWD.Common.EntityFrameworkCore.csproj
+++ b/AMWD.Common.EntityFrameworkCore/AMWD.Common.EntityFrameworkCore.csproj
@@ -1,36 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <Configurations>Debug;Release;DebugLocal</Configurations>
    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
    <LangVersion>10.0</LangVersion>

    <AssemblyName>AMWD.Common.EntityFrameworkCore</AssemblyName>
    <RootNamespace>AMWD.Common.EntityFrameworkCore</RootNamespace>
-    <NrtRevisionFormat>{semvertag:main}{!:-dirty}</NrtRevisionFormat>
-
-    <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
-    <CopyRefAssembliesToPublishDirectory>false</CopyRefAssembliesToPublishDirectory>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>

    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <EmbedUntrackedSources>false</EmbedUntrackedSources>
-
    <PackageId>AMWD.Common.EntityFrameworkCore</PackageId>
    <PackageIcon>icon.png</PackageIcon>
-    <PackageProjectUrl>https://wiki.am-wd.de/libs/common</PackageProjectUrl>
-
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://git.am-wd.de/AM.WD/common.git</RepositoryUrl>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>

    <Product>AM.WD Common Library for EntityFramework Core</Product>
-    <Description>Library with classes and extensions used frequently on AM.WD projects.</Description>
-    <Company>AM.WD</Company>
-    <Authors>Andreas Müller</Authors>
-    <Copyright>© {copyright:2020-} AM.WD</Copyright>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
  </PropertyGroup>

  <PropertyGroup Condition="'$(GITLAB_CI)' == 'true'">
--- a/AMWD.Common.Moq/AMWD.Common.Moq.csproj
+++ b/AMWD.Common.Moq/AMWD.Common.Moq.csproj
@@ -1,36 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <Configurations>Debug;Release;DebugLocal</Configurations>
    <TargetFramework>netstandard2.0</TargetFramework>
    <LangVersion>10.0</LangVersion>

    <AssemblyName>AMWD.Common.Moq</AssemblyName>
    <RootNamespace>AMWD.Common.Moq</RootNamespace>
-    <NrtRevisionFormat>{semvertag:main}{!:-dirty}</NrtRevisionFormat>
-
-    <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
-    <CopyRefAssembliesToPublishDirectory>false</CopyRefAssembliesToPublishDirectory>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>

    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <EmbedUntrackedSources>false</EmbedUntrackedSources>
-
    <PackageId>AMWD.Common.Moq</PackageId>
    <PackageIcon>icon.png</PackageIcon>
-    <PackageProjectUrl>https://wiki.am-wd.de/libs/common</PackageProjectUrl>
-
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://git.am-wd.de/AM.WD/common.git</RepositoryUrl>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>

    <Product>AM.WD Common Library for Moq</Product>
-    <Description>Library with classes and extensions used frequently on AM.WD projects.</Description>
-    <Company>AM.WD</Company>
-    <Authors>Andreas Müller</Authors>
-    <Copyright>© {copyright:2020-} AM.WD</Copyright>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
  </PropertyGroup>

  <PropertyGroup Condition="'$(GITLAB_CI)' == 'true'">
--- a/AMWD.Common/AMWD.Common.csproj
+++ b/AMWD.Common/AMWD.Common.csproj
@@ -1,36 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
+    <Configurations>Debug;Release;DebugLocal</Configurations>
    <TargetFramework>netstandard2.0</TargetFramework>
    <LangVersion>10.0</LangVersion>

    <AssemblyName>AMWD.Common</AssemblyName>
    <RootNamespace>AMWD.Common</RootNamespace>
-    <NrtRevisionFormat>{semvertag:main}{!:-dirty}</NrtRevisionFormat>
-
-    <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
-    <CopyRefAssembliesToPublishDirectory>false</CopyRefAssembliesToPublishDirectory>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>

    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <EmbedUntrackedSources>false</EmbedUntrackedSources>
-
    <PackageId>AMWD.Common</PackageId>
    <PackageIcon>icon.png</PackageIcon>
-    <PackageProjectUrl>https://wiki.am-wd.de/libs/common</PackageProjectUrl>
-
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://git.am-wd.de/AM.WD/common.git</RepositoryUrl>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>

    <Product>AM.WD Common Library</Product>
-    <Description>Library with classes and extensions used frequently on AM.WD projects.</Description>
-    <Company>AM.WD</Company>
-    <Authors>Andreas Müller</Authors>
-    <Copyright>© {copyright:2020-} AM.WD</Copyright>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
  </PropertyGroup>

  <PropertyGroup Condition="'$(GITLAB_CI)' == 'true'">
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,8 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

-## [Unreleased](https://git.am-wd.de/AM.WD/common/compare/v1.10.0...main) - 0000-00-00
-_nothing changed yet_
+## [Upcoming](https://git.am-wd.de/AM.WD/common/compare/v1.10.0...main) - 0000-00-00
+
+### Added
+
+- Added `directory.build.props` and `directory.build.targets`
+

 ## [v1.10.0](https://git.am-wd.de/AM.WD/common/compare/v1.9.0...v1.10.0) - 2022-09-18

--- a/Common.sln
+++ b/Common.sln
@@ -10,16 +10,6 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AMWD.Common.EntityFrameworkCore", "AMWD.Common.EntityFrameworkCore\AMWD.Common.EntityFrameworkCore.csproj", "{7091CECF-C981-4FB9-9CC6-91C4E65A6356}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AFBF83AE-FE7D-48C1-B7E7-31BF3E17C6FB}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		.gitignore = .gitignore
-		.gitlab-ci.yml = .gitlab-ci.yml
-		CHANGELOG.md = CHANGELOG.md
-		CodeMaid.config = CodeMaid.config
-		icon.png = icon.png
-		LICENSE.txt = LICENSE.txt
-		README.md = README.md
-	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F2C7556A-99EB-43EB-8954-56A24AFE928F}"
 EndProject
@@ -29,30 +19,63 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AMWD.Common.Moq", "AMWD.Com
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "UnitTests\UnitTests.csproj", "{9469D87B-126E-4338-92E3-701F762CB54D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{86DE1B7C-3ECF-49B1-AB28-A976A3973FF5}"
+	ProjectSection(SolutionItems) = preProject
+		CHANGELOG.md = CHANGELOG.md
+		icon.png = icon.png
+		LICENSE.txt = LICENSE.txt
+		README.md = README.md
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{7196DA2B-D858-4B25-BC23-865175CFCDEC}"
+	ProjectSection(SolutionItems) = preProject
+		.gitlab-ci.yml = .gitlab-ci.yml
+		directory.build.props = directory.build.props
+		directory.build.targets = directory.build.targets
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utils", "Utils", "{93EC8B16-7DEF-4E39-B590-E804DEF7C607}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		.gitignore = .gitignore
+		CodeMaid.config = CodeMaid.config
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		DebugLocal|Any CPU = DebugLocal|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{F512C474-B670-4E47-911E-7C0674AA8E7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F512C474-B670-4E47-911E-7C0674AA8E7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F512C474-B670-4E47-911E-7C0674AA8E7E}.DebugLocal|Any CPU.ActiveCfg = DebugLocal|Any CPU
+		{F512C474-B670-4E47-911E-7C0674AA8E7E}.DebugLocal|Any CPU.Build.0 = DebugLocal|Any CPU
 		{F512C474-B670-4E47-911E-7C0674AA8E7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F512C474-B670-4E47-911E-7C0674AA8E7E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{725F40C9-8172-487F-B3D0-D7E38B4DB197}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{725F40C9-8172-487F-B3D0-D7E38B4DB197}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{725F40C9-8172-487F-B3D0-D7E38B4DB197}.DebugLocal|Any CPU.ActiveCfg = DebugLocal|Any CPU
+		{725F40C9-8172-487F-B3D0-D7E38B4DB197}.DebugLocal|Any CPU.Build.0 = DebugLocal|Any CPU
 		{725F40C9-8172-487F-B3D0-D7E38B4DB197}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{725F40C9-8172-487F-B3D0-D7E38B4DB197}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7091CECF-C981-4FB9-9CC6-91C4E65A6356}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7091CECF-C981-4FB9-9CC6-91C4E65A6356}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7091CECF-C981-4FB9-9CC6-91C4E65A6356}.DebugLocal|Any CPU.ActiveCfg = DebugLocal|Any CPU
+		{7091CECF-C981-4FB9-9CC6-91C4E65A6356}.DebugLocal|Any CPU.Build.0 = DebugLocal|Any CPU
 		{7091CECF-C981-4FB9-9CC6-91C4E65A6356}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7091CECF-C981-4FB9-9CC6-91C4E65A6356}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6EBA2792-0B66-4C90-89A1-4E1D26D16443}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6EBA2792-0B66-4C90-89A1-4E1D26D16443}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6EBA2792-0B66-4C90-89A1-4E1D26D16443}.DebugLocal|Any CPU.ActiveCfg = DebugLocal|Any CPU
+		{6EBA2792-0B66-4C90-89A1-4E1D26D16443}.DebugLocal|Any CPU.Build.0 = DebugLocal|Any CPU
 		{6EBA2792-0B66-4C90-89A1-4E1D26D16443}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6EBA2792-0B66-4C90-89A1-4E1D26D16443}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9469D87B-126E-4338-92E3-701F762CB54D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9469D87B-126E-4338-92E3-701F762CB54D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9469D87B-126E-4338-92E3-701F762CB54D}.DebugLocal|Any CPU.ActiveCfg = DebugLocal|Any CPU
+		{9469D87B-126E-4338-92E3-701F762CB54D}.DebugLocal|Any CPU.Build.0 = DebugLocal|Any CPU
 		{9469D87B-126E-4338-92E3-701F762CB54D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9469D87B-126E-4338-92E3-701F762CB54D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
@@ -65,6 +88,9 @@ Global
 		{7091CECF-C981-4FB9-9CC6-91C4E65A6356} = {F2C7556A-99EB-43EB-8954-56A24AFE928F}
 		{6EBA2792-0B66-4C90-89A1-4E1D26D16443} = {F2C7556A-99EB-43EB-8954-56A24AFE928F}
 		{9469D87B-126E-4338-92E3-701F762CB54D} = {E5DF156A-6C8B-4004-BA4C-A8DDE6FD3ECD}
+		{86DE1B7C-3ECF-49B1-AB28-A976A3973FF5} = {AFBF83AE-FE7D-48C1-B7E7-31BF3E17C6FB}
+		{7196DA2B-D858-4B25-BC23-865175CFCDEC} = {AFBF83AE-FE7D-48C1-B7E7-31BF3E17C6FB}
+		{93EC8B16-7DEF-4E39-B590-E804DEF7C607} = {AFBF83AE-FE7D-48C1-B7E7-31BF3E17C6FB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {961E8DF8-DDF5-4D10-A510-CE409E9962AC}
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -0,0 +1,25 @@
+<Project>
+  <PropertyGroup>
+    <NrtRevisionFormat>{semvertag:main}</NrtRevisionFormat>
+
+    <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
+    <CopyRefAssembliesToPublishDirectory>false</CopyRefAssembliesToPublishDirectory>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <EmbedUntrackedSources>false</EmbedUntrackedSources>
+
+    <PackageProjectUrl>https://wiki.am-wd.de/libs/common</PackageProjectUrl>
+    <Description>Library with classes and extensions used frequently on AM.WD projects.</Description>
+
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://git.am-wd.de/AM.WD/common.git</RepositoryUrl>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+
+    <Company>AM.WD</Company>
+    <Authors>Andreas Müller</Authors>
+    <Copyright>© {copyright:2020-} AM.WD</Copyright>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+  </PropertyGroup>
+</Project>
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -0,0 +1,8 @@
+<Project>
+  <Target Condition="'$(Configuration)' == 'DebugLocal'" Name="MovePackageToLocal" AfterTargets="Pack">
+    <Delete Files="D:\NuGetLocal\$(PackageId).$(PackageVersion).nupkg" />
+    <Delete Files="$(MSBuildProjectDirectory)\bin\$(Configuration)\$(PackageId).$(PackageVersion).snupkg" />
+
+    <Move SourceFiles="$(MSBuildProjectDirectory)\bin\$(Configuration)\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="D:\NuGetLocal" />
+  </Target>
+</Project>
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License

-Copyright (c) 2020-2022 Andreas Müller
+Copyright (c) Andreas Müller

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/UnitTests/UnitTests.csproj
+++ b/UnitTests/UnitTests.csproj
@@ -4,6 +4,8 @@
    <TargetFramework>net6.0</TargetFramework>
    <IsPackable>false</IsPackable>
    <CollectCoverage>true</CollectCoverage>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
+    <Configurations>Debug;Release;DebugLocal</Configurations>
  </PropertyGroup>

  <ItemGroup>
@@ -21,7 +23,6 @@

  <ItemGroup>
    <ProjectReference Include="..\AMWD.Common.AspNetCore\AMWD.Common.AspNetCore.csproj" />
-    <!--ProjectReference Include="..\AMWD.Common.EntityFrameworkCore\AMWD.Common.EntityFrameworkCore.csproj" /-->
    <ProjectReference Include="..\AMWD.Common\AMWD.Common.csproj" />
  </ItemGroup>