Skip to content

Commit 6a05d15

Browse files
kdcllckdcllc
committed
upgrade build system
1 parent 943b6fc commit 6a05d15

17 files changed

Lines changed: 291 additions & 100 deletions

‎CometD.NetCore.Salesforce.sln‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp", "src\TestApp\Test
1919
EndProject
2020
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AuthApp", "src\AuthApp\AuthApp.csproj", "{0AC0A8E4-AF3E-4078-A472-0D2DC1392C00}"
2121
EndProject
22+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{DF67E08B-61B2-46CD-B3B0-56F6BDC4313E}"
23+
EndProject
2224
Global
2325
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2426
Debug|Any CPU = Debug|Any CPU

‎Directory.Build.props‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
<Project>
2-
<PropertyGroup>
2+
3+
<Import Project="build\settings.props" />
4+
<Import Project="build\sources.props" />
5+
6+
<PropertyGroup Label="Ownership Settings">
37
<Company>King David Consulting LLC</Company>
48
<Authors>kdcllc</Authors>
5-
<LangVersion>latest</LangVersion>
6-
<VersionPrefix>1.0.0</VersionPrefix>
79
<Copyright>King David Consulting LLC</Copyright>
810
</PropertyGroup>
11+
912
</Project>

‎Directory.Build.targets‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
3+
<Import Project="build\dependecies.props" />
4+
5+
</Project>

‎LICENSE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2017 King David Consulting LLC
3+
Copyright (c) 2017-2019 King David Consulting LLC
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1818
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
21+
SOFTWARE.

‎build/dependecies.props‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<NetCoreCommonVersion>2.1.1</NetCoreCommonVersion>
5+
</PropertyGroup>
6+
7+
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netstandard2.0'">
8+
<NetCoreCommonVersion>2.1.1</NetCoreCommonVersion>
9+
</PropertyGroup>
10+
11+
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.2'">
12+
<NetCoreCommonVersion>2.2.0</NetCoreCommonVersion>
13+
</PropertyGroup>
14+
15+
<ItemGroup Label="NetCore">
16+
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="$(NetCoreCommonVersion)" />
17+
<PackageReference Update="Microsoft.Extensions.Logging" Version="$(NetCoreCommonVersion)" />
18+
<PackageReference Update="Microsoft.Extensions.Logging.Configuration" Version="$(NetCoreCommonVersion)" />
19+
<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="$(NetCoreCommonVersion)" />
20+
<PackageReference Update="Microsoft.Extensions.Logging.Debug" Version="$(NetCoreCommonVersion)" />
21+
<PackageReference Update="Microsoft.Extensions.ObjectPool" Version="$(NetCoreCommonVersion)" />
22+
23+
<PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="$(NetCoreCommonVersion)" />
24+
<PackageReference Update="Microsoft.Extensions.Configuration.CommandLine" Version="$(NetCoreCommonVersion)" />
25+
<PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(NetCoreCommonVersion)" />
26+
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="$(NetCoreCommonVersion)" />
27+
<PackageReference Update="Microsoft.Extensions.Hosting" Version="$(NetCoreCommonVersion)" />
28+
<PackageReference Update="Microsoft.Extensions.Hosting.Abstractions" Version="$(NetCoreCommonVersion)" />
29+
30+
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="$(NetCoreCommonVersion)" />
31+
<PackageReference Update="Microsoft.Extensions.Options" Version="$(NetCoreCommonVersion)" />
32+
<PackageReference Update="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="$(NetCoreCommonVersion)" />
33+
<PackageReference Update="Microsoft.AspNetCore.Http" Version="$(NetCoreCommonVersion)" />
34+
<PackageReference Update="Microsoft.Extensions.Configuration.CommandLine" Version="$(NetCoreCommonVersion)" />
35+
<PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(NetCoreCommonVersion)" />
36+
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="$(NetCoreCommonVersion)" />
37+
<PackageReference Update="Microsoft.Extensions.Hosting" Version="$(NetCoreCommonVersion)" />
38+
</ItemGroup>
39+
40+
<ItemGroup Label="Shared Libraries">
41+
<PackageReference Update="Bet.AspNetCore" Version="1.0.2" />
42+
<PackageReference Update="CometD.NetCore2" Version="1.0.3" />
43+
<PackageReference Update="KDCLLC.BuildingBlocks.SalesforceEventBus" Version="1.0.2" />
44+
45+
<PackageReference Update="NetCoreForce.Client" Version="2.5.0" />
46+
<PackageReference Update="Polly" Version="7.0.2" />
47+
</ItemGroup>
48+
49+
<ItemGroup Label="SourceLink">
50+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
51+
</ItemGroup>
52+
</Project>

‎build/settings.props‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<Project>
2+
3+
<PropertyGroup Label="Basic Settings">
4+
<IsPackable>true</IsPackable>
5+
<VersionPrefix>1.0.0-pre</VersionPrefix>
6+
<LangVersion>latest</LangVersion>
7+
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
8+
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
9+
<NoWarn>$(NoWarn);CS1591</NoWarn>
10+
</PropertyGroup>
11+
12+
<PropertyGroup Label="Nuget Package Settings">
13+
<Description>Event Bus for Salesforce Platform events.</Description>
14+
<PackageProjectUrl>https://github.com/kdcllc/CometD.NetCore.Salesforce</PackageProjectUrl>
15+
<RepositoryUrl>https://github.com/kdcllc/CometD.NetCore.Salesforce.git</RepositoryUrl>
16+
<RepositoryType>git</RepositoryType>
17+
<PackageLicense>https://github.com/kdcllc/CometD.NetCore.Salesforce/blob/master/LICENSE</PackageLicense>
18+
<PackageIconUrl>https://raw.githubusercontent.com/kdcllc/CometD.NetCore.Salesforce/master/img/logo64x64.png</PackageIconUrl>
19+
<PackageTags>aspnetcore,dottet,salesforce, cometd, bayeux</PackageTags>
20+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
21+
</PropertyGroup>
22+
23+
<PropertyGroup Label="SourceLink Settings">
24+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
25+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
26+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
27+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
28+
</PropertyGroup>
29+
</Project>

‎build/sources.props‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Project>
2+
<Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
3+
4+
<PropertyGroup Label="RestoreSources">
5+
<RestoreSources>$(DotNetRestoreSources)</RestoreSources>
6+
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'false'">
7+
$(RestoreSources);
8+
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
9+
https://api.nuget.org/v3/index.json;
10+
</RestoreSources>
11+
</PropertyGroup>
12+
</Project>

‎clean.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2+
#!/bin/bash
3+
find . -name 'obj' -type d -exec rm -rv {} + ; find . -name 'bin' -type d -exec rm -rv {} + ;

‎src/AuthApp/AuthApp.csproj‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.1</TargetFramework>
5+
<TargetFrameworks>netcoreapp2.1;netcoreapp2.2</TargetFrameworks>
6+
<IsPackable>false</IsPackable>
67
</PropertyGroup>
78

89
<ItemGroup>
9-
<PackageReference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.1.1" />
10-
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.1" />
11-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.1.1" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
14-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="2.1.1" />
15-
<PackageReference Include="NetCoreForce.Client" Version="2.5.0" />
10+
<PackageReference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions"/>
11+
<PackageReference Include="Microsoft.AspNetCore.Http"/>
12+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine"/>
13+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables"/>
14+
<PackageReference Include="Microsoft.Extensions.Configuration.Json"/>
15+
<PackageReference Include="Microsoft.Extensions.Hosting"/>
16+
<PackageReference Include="NetCoreForce.Client"/>
1617
</ItemGroup>
1718
<ItemGroup>
1819
<Content Include="appsettings*.json" CopyToOutputDirectory="PreserveNewest" />

‎src/CometD.NetCore.Salesforce/CometD.NetCore.Salesforce.csproj‎

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,15 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<RootNamespace>CometD.NetCore2.Salesforce</RootNamespace>
6-
<Description>Event Bus for Salesforce Platform events.</Description>
7-
<PackageLicenseUrl>https://github.com/kdcllc/CometD.NetCore.Salesforce/blob/master/LICENSE</PackageLicenseUrl>
8-
<PackageProjectUrl>https://github.com/kdcllc/CometD.NetCore.Salesforce</PackageProjectUrl>
9-
<PackageIconUrl>https://raw.githubusercontent.com/kdcllc/CometD.NetCore.Salesforce/master/img/logo64x64.png</PackageIconUrl>
10-
<RepositoryUrl>https://github.com/kdcllc/CometD.NetCore.Salesforce.git</RepositoryUrl>
11-
<RepositoryType>git</RepositoryType>
12-
<PackageTags>salesforce, cometd, bayeux</PackageTags>
13-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
14-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
15-
</PropertyGroup>
16-
17-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
18-
<DefineConstants>DEBUG;TRACE</DefineConstants>
19-
<DebugType>full</DebugType>
20-
<DebugSymbols>true</DebugSymbols>
21-
</PropertyGroup>
22-
23-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
24-
<DebugType>pdbonly</DebugType>
25-
<DebugSymbols>true</DebugSymbols>
266
</PropertyGroup>
277

288
<ItemGroup>
29-
<PackageReference Include="CometD.NetCore2" Version="1.0.3" />
30-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
31-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
32-
<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.1" />
33-
<PackageReference Include="NetCoreForce.Client" Version="2.5.0" />
34-
<PackageReference Include="Polly" Version="6.1.2" />
9+
<PackageReference Include="CometD.NetCore2"/>
10+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions"/>
11+
<PackageReference Include="Microsoft.Extensions.DependencyInjection"/>
12+
<PackageReference Include="Microsoft.Extensions.Options" />
13+
<PackageReference Include="NetCoreForce.Client"/>
14+
<PackageReference Include="Polly"/>
3515
</ItemGroup>
3616

3717
</Project>

0 commit comments

Comments
 (0)