Connected/Connected.Framework.ServiceModel
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'features/dependencyModel' (#2) from features/dependencyModel into develop

Browse Source 
Reviewed-on: #2
This commit is contained in:
Matija Koželj 2023-02-17 13:41:02 +00:00
commit 0643077200
8 changed files with 82 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -414,6 +414,7 @@ FodyWeavers.xsd
#ignore all in root folder except the allowed values #ignore all in root folder except the allowed values
/* /*
!nuget.config
!.editorconfig !.editorconfig
!.gitignore !.gitignore
!LICENSE !LICENSE
@ -426,4 +427,5 @@ FodyWeavers.xsd
!/src !/src
!/tests !/tests
!/tools !/tools
!/dependencies
!/*.[Ss][Ll][Nn] !/*.[Ss][Ll][Nn]

6
.gitmodules vendored Normal file
View File

@ -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

40
Framework.ServiceModel.sln
View File

@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17 # Visual Studio Version 17
VisualStudioVersion = 17.4.33027.239 VisualStudioVersion = 17.4.33027.239
MinimumVisualStudioVersion = 10.0.40219.1 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}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel", "src\Connected.ServiceModel\Connected.ServiceModel.csproj", "{EEAAA364-FCF2-4975-8321-A475778D684C}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected", "..\Connected\src\Connected\Connected.csproj", "{6F70D808-2CB4-4844-B72C-BE01E91C7861}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{921C93ED-C848-4465-AE42-CE64D266719F}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "..\connected.framework\src\Connected.Entities\Connected.Entities.csproj", "{2157CA78-5896-423A-821C-C322814FE3F8}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected", "dependencies\Connected\src\Connected\Connected.csproj", "{7EA2F351-8146-4265-B5D5-E399910DDF5B}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Runtime", "..\connected.framework\src\Connected.Runtime\Connected.Runtime.csproj", "{0CE8C487-CE51-40EA-9525-9673277818C1}" 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 EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -23,26 +23,26 @@ Global
{EEAAA364-FCF2-4975-8321-A475778D684C}.Debug|Any CPU.Build.0 = Debug|Any CPU {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.ActiveCfg = Release|Any CPU
{EEAAA364-FCF2-4975-8321-A475778D684C}.Release|Any CPU.Build.0 = 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 {7EA2F351-8146-4265-B5D5-E399910DDF5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6F70D808-2CB4-4844-B72C-BE01E91C7861}.Debug|Any CPU.Build.0 = Debug|Any CPU {7EA2F351-8146-4265-B5D5-E399910DDF5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6F70D808-2CB4-4844-B72C-BE01E91C7861}.Release|Any CPU.ActiveCfg = Release|Any CPU {7EA2F351-8146-4265-B5D5-E399910DDF5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6F70D808-2CB4-4844-B72C-BE01E91C7861}.Release|Any CPU.Build.0 = Release|Any CPU {7EA2F351-8146-4265-B5D5-E399910DDF5B}.Release|Any CPU.Build.0 = Release|Any CPU
{2157CA78-5896-423A-821C-C322814FE3F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D418A843-2153-45BC-9F16-2A24EAD060C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2157CA78-5896-423A-821C-C322814FE3F8}.Debug|Any CPU.Build.0 = Debug|Any CPU {D418A843-2153-45BC-9F16-2A24EAD060C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2157CA78-5896-423A-821C-C322814FE3F8}.Release|Any CPU.ActiveCfg = Release|Any CPU {D418A843-2153-45BC-9F16-2A24EAD060C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2157CA78-5896-423A-821C-C322814FE3F8}.Release|Any CPU.Build.0 = Release|Any CPU {D418A843-2153-45BC-9F16-2A24EAD060C8}.Release|Any CPU.Build.0 = Release|Any CPU
{0CE8C487-CE51-40EA-9525-9673277818C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8CC5AEDC-68EC-423D-8F1C-ABD7A4F3CBBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0CE8C487-CE51-40EA-9525-9673277818C1}.Debug|Any CPU.Build.0 = Debug|Any CPU {8CC5AEDC-68EC-423D-8F1C-ABD7A4F3CBBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0CE8C487-CE51-40EA-9525-9673277818C1}.Release|Any CPU.ActiveCfg = Release|Any CPU {8CC5AEDC-68EC-423D-8F1C-ABD7A4F3CBBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0CE8C487-CE51-40EA-9525-9673277818C1}.Release|Any CPU.Build.0 = Release|Any CPU {8CC5AEDC-68EC-423D-8F1C-ABD7A4F3CBBF}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(NestedProjects) = preSolution GlobalSection(NestedProjects) = preSolution
{6F70D808-2CB4-4844-B72C-BE01E91C7861} = {6EFC1819-8C82-49C6-B893-B84E8C218560} {7EA2F351-8146-4265-B5D5-E399910DDF5B} = {921C93ED-C848-4465-AE42-CE64D266719F}
{2157CA78-5896-423A-821C-C322814FE3F8} = {6EFC1819-8C82-49C6-B893-B84E8C218560} {D418A843-2153-45BC-9F16-2A24EAD060C8} = {921C93ED-C848-4465-AE42-CE64D266719F}
{0CE8C487-CE51-40EA-9525-9673277818C1} = {6EFC1819-8C82-49C6-B893-B84E8C218560} {8CC5AEDC-68EC-423D-8F1C-ABD7A4F3CBBF} = {921C93ED-C848-4465-AE42-CE64D266719F}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {1EC384B4-F27F-4F71-8BDC-16F7BA8689E9} SolutionGuid = {1EC384B4-F27F-4F71-8BDC-16F7BA8689E9}

1
build/buildProjects.bat Normal file
View File

@ -0,0 +1 @@
dotnet build ../src/Connected.ServiceModel/Connected.ServiceModel.csproj

1
dependencies/Connected vendored Submodule

@ -0,0 +1 @@
Subproject commit 9eb9949950a4b99f31e8800eb41e1b97ec00f8be

1
dependencies/Connected.Framework vendored Submodule

@ -0,0 +1 @@
Subproject commit 79ea6dc46dbacd608bbde582a0c560d2cc8e2154

16
nuget.config Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<config>
<add key="repositoryPath" value="%PACKAGEHOME%/External" />
</config>
<packageRestore>
<add key="enabled" value="True" />
<add key="automatic" value="True" />
</packageRestore>
<packageSources>
<add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
</packageSources>
<disabledPackageSources />
</configuration>

49
src/Connected.ServiceModel/Connected.ServiceModel.csproj
View File

@ -1,19 +1,40 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Title>$(AssemblyName)</Title>
<Authors>Tom PIT</Authors>
<Copyright>2022 Tom PIT</Copyright>
<PackageProjectUrl>https://git.tompit.com/Connected/Info</PackageProjectUrl>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageTags>connected;platform;</PackageTags>
<IncludeSymbols>True</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageOutputPath>$(OutputPath)</PackageOutputPath>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0-rc.2.22472.3" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.*-*" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\connected.framework\src\Connected.Entities\Connected.Entities.csproj" /> <None Include="..\..\LICENSE">
<ProjectReference Include="..\..\..\connected.framework\src\Connected.Runtime\Connected.Runtime.csproj" /> <Pack>True</Pack>
<ProjectReference Include="..\..\..\Connected\src\Connected\Connected.csproj" /> <PackagePath>\</PackagePath>
</ItemGroup> </None>
<None Include="..\..\README.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\dependencies\Connected.Framework\src\Connected.Entities\Connected.Entities.csproj" />
<ProjectReference Include="..\..\dependencies\Connected.Framework\src\Connected.Runtime\Connected.Runtime.csproj" />
<ProjectReference Include="..\..\dependencies\Connected\src\Connected\Connected.csproj" />
</ItemGroup>
</Project> </Project>