Compare commits

...

3 Commits

Author SHA1 Message Date
Matija Koželj
96acf86f56 Remove ltd from Tom PIT 2023-02-17 14:38:54 +01:00
Matija Koželj
419cebea56 Sort out dependencies 2023-02-17 14:38:34 +01:00
Matija Koželj
e347d7e73f Add dependency on Connected
Add dependency on Connected.Framework
2023-02-17 14:32:35 +01:00
8 changed files with 42 additions and 29 deletions

1
.gitignore vendored
View File

@ -427,4 +427,5 @@ FodyWeavers.xsd
!/src
!/tests
!/tools
!/dependencies
!/*.[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

View File

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

1
dependencies/Connected vendored Submodule

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

1
dependencies/Connected.Framework vendored Submodule

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

View File

@ -10,7 +10,6 @@
</packageRestore>
<packageSources>
<add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
<add key="Local repository" value="%LOCAL_NUGET%" />
</packageSources>
<disabledPackageSources />

View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
@ -6,8 +6,8 @@
<Nullable>enable</Nullable>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Title>$(AssemblyName)</Title>
<Authors>Tom PIT ltd</Authors>
<Copyright>2022 Tom PIT ltd</Copyright>
<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>
@ -18,14 +18,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Connected" Version="1.0.*-*"/>
<PackageReference Include="Connected.Runtime" Version="1.0.*-*"/>
<PackageReference Include="Connected.Entities" Version="1.0.*-*"/>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.*-*" />
<PackageReference Include="Nerdbank.GitVersioning"
Version="3.5.119"
PrivateAssets="all"
Condition="!Exists('packages.config')" />
</ItemGroup>
<ItemGroup>
@ -39,8 +32,9 @@
</None>
</ItemGroup>
<Target Name="CopyPackages" AfterTargets="Pack">
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
</Target>
<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>

View File

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