From 486ca35e9c7bc8de5c3d7fb4d9e3364f172f00a7 Mon Sep 17 00:00:00 2001 From: Lars Skovslund Date: Sat, 30 Jan 2021 10:21:08 +0100 Subject: [PATCH 1/3] Align distribution build structure. - Images folder added - Nullable set to annotations for test projects. - Added support for nuget package configuration --- distribution/Directory.Build.props | 23 +++++---- distribution/images/icon.png | Bin 0 -> 5270 bytes distribution/src/Directory.Build.props | 65 ++++++++++++++++++++---- distribution/test/Directory.Build.props | 4 ++ 4 files changed, 74 insertions(+), 18 deletions(-) create mode 100644 distribution/images/icon.png diff --git a/distribution/Directory.Build.props b/distribution/Directory.Build.props index db79e0b..a5ca86c 100644 --- a/distribution/Directory.Build.props +++ b/distribution/Directory.Build.props @@ -1,10 +1,15 @@ + + atc-net + atc-cosmos + + - CompanyName - CompanyName + $(OrganizationName) + $(OrganizationName) en en-US @@ -22,9 +27,9 @@ AllEnabledByDefault - true - latest - true + true + latest + true @@ -35,12 +40,12 @@ - - + + - + - + diff --git a/distribution/images/icon.png b/distribution/images/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e54b910bc9a2b46d2673b5dba2a38f23129055ed GIT binary patch literal 5270 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 literal 0 HcmV?d00001 diff --git a/distribution/src/Directory.Build.props b/distribution/src/Directory.Build.props index 1c37f84..6793c3b 100644 --- a/distribution/src/Directory.Build.props +++ b/distribution/src/Directory.Build.props @@ -6,20 +6,67 @@ --> - - - - MIT + + + + https://github.com/$(OrganizationName)/$(RepositoryName) git - https://github.com/$(OrganizationName)/$(RepositoryName) - - true - true + MIT + https://github.com/$(OrganizationName)/$(RepositoryName) + icon.png + + + + + + + + + Library + net5.0 + + true + + snupkg + + true + embedded - + + + true + + + + + + + true diff --git a/distribution/test/Directory.Build.props b/distribution/test/Directory.Build.props index a70ecbc..73044b8 100644 --- a/distribution/test/Directory.Build.props +++ b/distribution/test/Directory.Build.props @@ -6,6 +6,10 @@ --> + + annotations + + From c9dc03d209cbb434eb909f8b42bdfa8fbb8d04c5 Mon Sep 17 00:00:00 2001 From: Lars Skovslund Date: Sat, 30 Jan 2021 10:27:28 +0100 Subject: [PATCH 2/3] Replaced name of organization and repository and xml comments. --- distribution/Directory.Build.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distribution/Directory.Build.props b/distribution/Directory.Build.props index a5ca86c..cbb8fe5 100644 --- a/distribution/Directory.Build.props +++ b/distribution/Directory.Build.props @@ -2,8 +2,8 @@ - atc-net - atc-cosmos + + From 1f098967f6e4506e4977c7d58fde299cb63575ee Mon Sep 17 00:00:00 2001 From: Lars Skovslund Date: Sun, 31 Jan 2021 09:36:38 +0100 Subject: [PATCH 3/3] Corrected casing in comments and on PrivateAssets attributes. --- distribution/Directory.Build.props | 8 ++++---- distribution/src/Directory.Build.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/distribution/Directory.Build.props b/distribution/Directory.Build.props index cbb8fe5..63a2fc5 100644 --- a/distribution/Directory.Build.props +++ b/distribution/Directory.Build.props @@ -40,12 +40,12 @@ - - + + - + - + diff --git a/distribution/src/Directory.Build.props b/distribution/src/Directory.Build.props index 6793c3b..01c3429 100644 --- a/distribution/src/Directory.Build.props +++ b/distribution/src/Directory.Build.props @@ -36,12 +36,12 @@ Library net5.0 - + true snupkg true