From 3baad8822283b4d7aecc0f1cc66dd1565c686297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20Ko=C5=BEelj?= Date: Thu, 29 Dec 2022 10:25:50 +0100 Subject: [PATCH 1/7] Add automatic nuget uild to Connected.ServiceModel Add automatic versioning to Conected.ServiceModel --- .../Connected.ServiceModel.csproj | 53 ++++++++++++++----- src/Connected.ServiceModel/version.json | 14 +++++ 2 files changed, 54 insertions(+), 13 deletions(-) create mode 100644 src/Connected.ServiceModel/version.json diff --git a/src/Connected.ServiceModel/Connected.ServiceModel.csproj b/src/Connected.ServiceModel/Connected.ServiceModel.csproj index 02f6d85..cc68bbe 100644 --- a/src/Connected.ServiceModel/Connected.ServiceModel.csproj +++ b/src/Connected.ServiceModel/Connected.ServiceModel.csproj @@ -1,19 +1,46 @@ - - net7.0 - enable - enable - + + net7.0 + enable + enable + True + $(AssemblyName) + Tom PIT ltd + 2022 Tom PIT ltd + https://git.tompit.com/Connected/Info + README.md + connected;platform; + True + snupkg + LICENSE + $(OutputPath) + - - - + + + + + + + - - - - - + + + True + \ + + + True + \ + + + + + + diff --git a/src/Connected.ServiceModel/version.json b/src/Connected.ServiceModel/version.json new file mode 100644 index 0000000..2a1593f --- /dev/null +++ b/src/Connected.ServiceModel/version.json @@ -0,0 +1,14 @@ +{ + "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", + "version": "1.0-prerelease", + "semVer1NumericIdentifierPadding": 4, + "nugetPackageVersion": { + "semVer": 2, // optional. Set to either 1 or 2 to control how the NuGet package version string is generated. Default is 1. + "precision": "build" // optional. Use when you want to use a more or less precise package version than the default major.minor.build. + }, + "cloudBuild": { + "buildNumber": { + "enabled": true + } + } +} \ No newline at end of file -- 2.36.3 From b17b28d7588ff928bd614a2515f24f0c4b992a9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20Ko=C5=BEelj?= Date: Thu, 29 Dec 2022 10:26:15 +0100 Subject: [PATCH 2/7] Remove unused dependencies --- Framework.ServiceModel.sln | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/Framework.ServiceModel.sln b/Framework.ServiceModel.sln index f9048cc..768e9e5 100644 --- a/Framework.ServiceModel.sln +++ b/Framework.ServiceModel.sln @@ -3,16 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.4.33027.239 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{6EFC1819-8C82-49C6-B893-B84E8C218560}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel", "src\Connected.ServiceModel\Connected.ServiceModel.csproj", "{EEAAA364-FCF2-4975-8321-A475778D684C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected", "..\Connected\src\Connected\Connected.csproj", "{6F70D808-2CB4-4844-B72C-BE01E91C7861}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "..\connected.framework\src\Connected.Entities\Connected.Entities.csproj", "{2157CA78-5896-423A-821C-C322814FE3F8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Runtime", "..\connected.framework\src\Connected.Runtime\Connected.Runtime.csproj", "{0CE8C487-CE51-40EA-9525-9673277818C1}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -23,27 +15,10 @@ Global {EEAAA364-FCF2-4975-8321-A475778D684C}.Debug|Any CPU.Build.0 = Debug|Any CPU {EEAAA364-FCF2-4975-8321-A475778D684C}.Release|Any CPU.ActiveCfg = Release|Any CPU {EEAAA364-FCF2-4975-8321-A475778D684C}.Release|Any CPU.Build.0 = Release|Any CPU - {6F70D808-2CB4-4844-B72C-BE01E91C7861}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F70D808-2CB4-4844-B72C-BE01E91C7861}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F70D808-2CB4-4844-B72C-BE01E91C7861}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F70D808-2CB4-4844-B72C-BE01E91C7861}.Release|Any CPU.Build.0 = Release|Any CPU - {2157CA78-5896-423A-821C-C322814FE3F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2157CA78-5896-423A-821C-C322814FE3F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2157CA78-5896-423A-821C-C322814FE3F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2157CA78-5896-423A-821C-C322814FE3F8}.Release|Any CPU.Build.0 = Release|Any CPU - {0CE8C487-CE51-40EA-9525-9673277818C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0CE8C487-CE51-40EA-9525-9673277818C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0CE8C487-CE51-40EA-9525-9673277818C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0CE8C487-CE51-40EA-9525-9673277818C1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {6F70D808-2CB4-4844-B72C-BE01E91C7861} = {6EFC1819-8C82-49C6-B893-B84E8C218560} - {2157CA78-5896-423A-821C-C322814FE3F8} = {6EFC1819-8C82-49C6-B893-B84E8C218560} - {0CE8C487-CE51-40EA-9525-9673277818C1} = {6EFC1819-8C82-49C6-B893-B84E8C218560} - EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1EC384B4-F27F-4F71-8BDC-16F7BA8689E9} EndGlobalSection -- 2.36.3 From 2ea140ac81d122e162a707013332fcfcd6572208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20Ko=C5=BEelj?= Date: Thu, 29 Dec 2022 10:28:22 +0100 Subject: [PATCH 3/7] Add autobuild file for Connected.ServiceModel --- build/buildProjects.bat | 1 + 1 file changed, 1 insertion(+) create mode 100644 build/buildProjects.bat diff --git a/build/buildProjects.bat b/build/buildProjects.bat new file mode 100644 index 0000000..cb5f773 --- /dev/null +++ b/build/buildProjects.bat @@ -0,0 +1 @@ +dotnet build ../src/Connected.ServiceModel/Connected.ServiceModel.csproj \ No newline at end of file -- 2.36.3 From 8e16bc027ac1af2f38c1c38087601277e486f0ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20Ko=C5=BEelj?= Date: Thu, 29 Dec 2022 11:05:37 +0100 Subject: [PATCH 4/7] Add nuget.config to .gitignore root exceptions Add nuget.config --- .gitignore | 1 + nuget.config | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 nuget.config diff --git a/.gitignore b/.gitignore index c0c35c1..246dda6 100644 --- a/.gitignore +++ b/.gitignore @@ -414,6 +414,7 @@ FodyWeavers.xsd #ignore all in root folder except the allowed values /* +!nuget.config !.editorconfig !.gitignore !LICENSE diff --git a/nuget.config b/nuget.config new file mode 100644 index 0000000..cf4c076 --- /dev/null +++ b/nuget.config @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file -- 2.36.3 From e347d7e73fe816304b731bcae1d6968f61e1461c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20Ko=C5=BEelj?= Date: Fri, 17 Feb 2023 14:32:35 +0100 Subject: [PATCH 5/7] Add dependency on Connected Add dependency on Connected.Framework --- .gitignore | 1 + .gitmodules | 6 ++++++ dependencies/Connected | 1 + dependencies/Connected.Framework | 1 + nuget.config | 1 - 5 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .gitmodules create mode 160000 dependencies/Connected create mode 160000 dependencies/Connected.Framework diff --git a/.gitignore b/.gitignore index 246dda6..548a0b3 100644 --- a/.gitignore +++ b/.gitignore @@ -427,4 +427,5 @@ FodyWeavers.xsd !/src !/tests !/tools +!/dependencies !/*.[Ss][Ll][Nn] \ No newline at end of file diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..89ea642 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "dependencies/Connected"] + path = dependencies/Connected + url = https://git.tompit.com/Connected/Connected.git +[submodule "dependencies/Connected.Framework"] + path = dependencies/Connected.Framework + url = https://git.tompit.com/Connected/Connected.Framework.git diff --git a/dependencies/Connected b/dependencies/Connected new file mode 160000 index 0000000..9eb9949 --- /dev/null +++ b/dependencies/Connected @@ -0,0 +1 @@ +Subproject commit 9eb9949950a4b99f31e8800eb41e1b97ec00f8be diff --git a/dependencies/Connected.Framework b/dependencies/Connected.Framework new file mode 160000 index 0000000..79ea6dc --- /dev/null +++ b/dependencies/Connected.Framework @@ -0,0 +1 @@ +Subproject commit 79ea6dc46dbacd608bbde582a0c560d2cc8e2154 diff --git a/nuget.config b/nuget.config index cf4c076..bc9e7c4 100644 --- a/nuget.config +++ b/nuget.config @@ -10,7 +10,6 @@ - -- 2.36.3 From 419cebea562cff6824dab4ad965b970a83fbf754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20Ko=C5=BEelj?= Date: Fri, 17 Feb 2023 14:38:34 +0100 Subject: [PATCH 6/7] Sort out dependencies --- Framework.ServiceModel.sln | 25 +++++++++++++++++++ .../Connected.ServiceModel.csproj | 18 +++++-------- src/Connected.ServiceModel/version.json | 14 ----------- 3 files changed, 31 insertions(+), 26 deletions(-) delete mode 100644 src/Connected.ServiceModel/version.json diff --git a/Framework.ServiceModel.sln b/Framework.ServiceModel.sln index 768e9e5..5149200 100644 --- a/Framework.ServiceModel.sln +++ b/Framework.ServiceModel.sln @@ -5,6 +5,14 @@ VisualStudioVersion = 17.4.33027.239 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel", "src\Connected.ServiceModel\Connected.ServiceModel.csproj", "{EEAAA364-FCF2-4975-8321-A475778D684C}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{921C93ED-C848-4465-AE42-CE64D266719F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected", "dependencies\Connected\src\Connected\Connected.csproj", "{7EA2F351-8146-4265-B5D5-E399910DDF5B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "dependencies\Connected.Framework\src\Connected.Entities\Connected.Entities.csproj", "{D418A843-2153-45BC-9F16-2A24EAD060C8}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Runtime", "dependencies\Connected.Framework\src\Connected.Runtime\Connected.Runtime.csproj", "{8CC5AEDC-68EC-423D-8F1C-ABD7A4F3CBBF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,10 +23,27 @@ Global {EEAAA364-FCF2-4975-8321-A475778D684C}.Debug|Any CPU.Build.0 = Debug|Any CPU {EEAAA364-FCF2-4975-8321-A475778D684C}.Release|Any CPU.ActiveCfg = Release|Any CPU {EEAAA364-FCF2-4975-8321-A475778D684C}.Release|Any CPU.Build.0 = Release|Any CPU + {7EA2F351-8146-4265-B5D5-E399910DDF5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7EA2F351-8146-4265-B5D5-E399910DDF5B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7EA2F351-8146-4265-B5D5-E399910DDF5B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7EA2F351-8146-4265-B5D5-E399910DDF5B}.Release|Any CPU.Build.0 = Release|Any CPU + {D418A843-2153-45BC-9F16-2A24EAD060C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D418A843-2153-45BC-9F16-2A24EAD060C8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D418A843-2153-45BC-9F16-2A24EAD060C8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D418A843-2153-45BC-9F16-2A24EAD060C8}.Release|Any CPU.Build.0 = Release|Any CPU + {8CC5AEDC-68EC-423D-8F1C-ABD7A4F3CBBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8CC5AEDC-68EC-423D-8F1C-ABD7A4F3CBBF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8CC5AEDC-68EC-423D-8F1C-ABD7A4F3CBBF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8CC5AEDC-68EC-423D-8F1C-ABD7A4F3CBBF}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {7EA2F351-8146-4265-B5D5-E399910DDF5B} = {921C93ED-C848-4465-AE42-CE64D266719F} + {D418A843-2153-45BC-9F16-2A24EAD060C8} = {921C93ED-C848-4465-AE42-CE64D266719F} + {8CC5AEDC-68EC-423D-8F1C-ABD7A4F3CBBF} = {921C93ED-C848-4465-AE42-CE64D266719F} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1EC384B4-F27F-4F71-8BDC-16F7BA8689E9} EndGlobalSection diff --git a/src/Connected.ServiceModel/Connected.ServiceModel.csproj b/src/Connected.ServiceModel/Connected.ServiceModel.csproj index cc68bbe..d01e8e6 100644 --- a/src/Connected.ServiceModel/Connected.ServiceModel.csproj +++ b/src/Connected.ServiceModel/Connected.ServiceModel.csproj @@ -1,4 +1,4 @@ - + net7.0 @@ -18,14 +18,7 @@ - - - - @@ -39,8 +32,9 @@ - - - - + + + + + diff --git a/src/Connected.ServiceModel/version.json b/src/Connected.ServiceModel/version.json deleted file mode 100644 index 2a1593f..0000000 --- a/src/Connected.ServiceModel/version.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", - "version": "1.0-prerelease", - "semVer1NumericIdentifierPadding": 4, - "nugetPackageVersion": { - "semVer": 2, // optional. Set to either 1 or 2 to control how the NuGet package version string is generated. Default is 1. - "precision": "build" // optional. Use when you want to use a more or less precise package version than the default major.minor.build. - }, - "cloudBuild": { - "buildNumber": { - "enabled": true - } - } -} \ No newline at end of file -- 2.36.3 From 96acf86f56496ed1aeea76b55c53a94016da9bc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20Ko=C5=BEelj?= Date: Fri, 17 Feb 2023 14:38:54 +0100 Subject: [PATCH 7/7] Remove ltd from Tom PIT --- src/Connected.ServiceModel/Connected.ServiceModel.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Connected.ServiceModel/Connected.ServiceModel.csproj b/src/Connected.ServiceModel/Connected.ServiceModel.csproj index d01e8e6..85103ae 100644 --- a/src/Connected.ServiceModel/Connected.ServiceModel.csproj +++ b/src/Connected.ServiceModel/Connected.ServiceModel.csproj @@ -6,8 +6,8 @@ enable True $(AssemblyName) - Tom PIT ltd - 2022 Tom PIT ltd + Tom PIT + 2022 Tom PIT https://git.tompit.com/Connected/Info README.md connected;platform; -- 2.36.3