Skip to content

Commit 4027963

Browse files
kdcllckdcllc
committed
updating dotnetcore and also solving issue #10 
1 parent 149af4a commit 4027963

12 files changed

Lines changed: 57 additions & 43 deletions

File tree

‎Directory.Build.props‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,4 @@
33
<Import Project="build\settings.props" />
44
<Import Project="build\sources.props" />
55

6-
<PropertyGroup Label="Ownership Settings">
7-
<Company>King David Consulting LLC</Company>
8-
<Authors>kdcllc</Authors>
9-
<Copyright>King David Consulting LLC</Copyright>
10-
</PropertyGroup>
11-
126
</Project>

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# CometD .NET Core implementation of Salesforce Platform events
2+
23
[![Build status](https://ci.appveyor.com/api/projects/status/baalfhs6vvc38icc?svg=true)](https://ci.appveyor.com/project/kdcllc/cometd-netcore-salesforce)
34

45
This repo contains the CometD .NET Core implementation for Salesforce Platform events.

‎appveyor.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
version: 2.1.{build}
1+
version: 2.2.{build}
22
branches:
33
only:
44
- master
55
pull_requests:
66
do_not_increment_build_number: true
7-
image: Visual Studio 2017
8-
## temporary until 3.0.100-preview-010184 sdk is installed
7+
image: Visual Studio 2019
8+
## temporary until 3.0.100 sdk is installed
99
install:
10-
- ps: $urlCurrent = "https://dotnetcli.blob.core.windows.net/dotnet/Sdk/3.0.100-preview-010184/dotnet-sdk-3.0.100-preview-010184-win-x64.zip"
10+
- ps: $urlCurrent = "https://dotnetcli.blob.core.windows.net/dotnet/Sdk/3.0.100/dotnet-sdk-3.0.100-win-x64.zip"
1111
- ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
1212
- ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
1313
- ps: $tempFileCurrent = [System.IO.Path]::GetTempFileName()
@@ -21,9 +21,9 @@ build_script:
2121
- ps: dotnet restore CometD.NetCore.Salesforce.sln -v quiet
2222
- ps: dotnet build CometD.NetCore.Salesforce.sln /p:configuration=Release /p:Version=$($env:appveyor_build_version)
2323

24-
test: off
25-
# test_script:
26-
# - dotnet test tests/XUnitTests.csproj
24+
#test: off
25+
test_script:
26+
- dotnet test test/CometD.UnitTest/CometD.UnitTest.csproj
2727

2828
artifacts:
2929
- path: .\src\**\*.nupkg
@@ -33,6 +33,6 @@ deploy:
3333
- provider: NuGet
3434
artifact: /NuGet/
3535
api_key:
36-
secure: btoBG0IlGqSMBtVLUjeXmVtFT7B9Lw6CNf85ryr8Urf3982Vlz1LDkmIewZ/1tF7
36+
secure: jrexooMHJwdbj5MGacSL9fCj3g2haDXMarPEkiLpdIZmasb/zeMYb0NVofvi5HvJ
3737
on:
3838
branch: master

‎build/dependecies.props‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<NetCoreCommonVersion>2.2.*</NetCoreCommonVersion>
5-
<BetCommonVersion>1.1.19</BetCommonVersion>
5+
<BetCommonVersion>2.0</BetCommonVersion>
66
</PropertyGroup>
77

88
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netstandard2.0'">
@@ -13,8 +13,8 @@
1313
<NetCoreCommonVersion>2.2.0</NetCoreCommonVersion>
1414
</PropertyGroup>
1515

16-
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
17-
<NetCoreCommonVersion>3.0.0-preview*</NetCoreCommonVersion>
16+
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' Or '$(TargetFramework)' == 'netstandard2.1'">
17+
<NetCoreCommonVersion>3.0.0</NetCoreCommonVersion>
1818
</PropertyGroup>
1919

2020
<ItemGroup Label="NetCore">
@@ -37,20 +37,27 @@
3737
</ItemGroup>
3838

3939
<ItemGroup Label="Bet">
40+
<PackageReference Update="Bet.Extensions" Version="$(BetCommonVersion)" />
4041
<PackageReference Update="Bet.Extensions.Options" Version="$(BetCommonVersion)" />
4142
<PackageReference Update="Bet.Extensions.Hosting" Version="$(BetCommonVersion)" />
4243
<PackageReference Update="Bet.Extensions.AzureVault" Version="$(BetCommonVersion)"/>
4344
<PackageReference Update="Bet.Extensions.Logging" Version="$(BetCommonVersion)"/>
4445
</ItemGroup>
4546

4647
<ItemGroup Label="Shared Libraries">
47-
<PackageReference Update="Bet.Extensions" Version="1.1.19" />
48-
<PackageReference Update="CometD.NetCore2" Version="2.0.1" />
48+
<PackageReference Update="CometD.NetCore2" Version="2.0.3" />
4949
<PackageReference Update="Bet.BuildingBlocks.SalesforceEventBus" Version="2.0.0" />
50-
<PackageReference Update="McMaster.Extensions.CommandLineUtils" Version="2.3.2"/>
50+
<PackageReference Update="McMaster.Extensions.CommandLineUtils" Version="2.4.4"/>
5151
<PackageReference Update="NetCoreForce.Client" Version="2.5.0" />
52-
<PackageReference Update="Polly" Version="7.0.2" />
52+
<PackageReference Update="Polly" Version="7.1.1" />
5353
<PackageReference Update="Colorful.Console" Version="1.2.9" />
54+
<PackageReference Update="TextCopy" Version="1.7.1" />
55+
</ItemGroup>
56+
57+
<ItemGroup Label="Testing">
58+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.4.0" />
59+
<PackageReference Update="xunit" Version="2.4.1" />
60+
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
5461
</ItemGroup>
5562

5663
<ItemGroup Label="SourceLink">

‎build/settings.props‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,20 @@
22

33
<PropertyGroup Label="Basic Settings">
44
<IsPackable>true</IsPackable>
5-
<VersionPrefix>2.2.0-pre</VersionPrefix>
5+
<VersionPrefix>2.2.0-preview</VersionPrefix>
66
<LangVersion>latest</LangVersion>
77
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
88
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
99
<NoWarn>$(NoWarn);CS1591</NoWarn>
1010
</PropertyGroup>
1111

12+
13+
<PropertyGroup Label="Ownership Settings">
14+
<Company>King David Consulting LLC</Company>
15+
<Authors>kdcllc</Authors>
16+
<Copyright>King David Consulting LLC</Copyright>
17+
</PropertyGroup>
18+
1219
<PropertyGroup Label="Nuget Package Settings">
1320
<Description>Event Bus for Salesforce Platform events.</Description>
1421
<PackageProjectUrl>https://github.com/kdcllc/CometD.NetCore.Salesforce</PackageProjectUrl>

‎src/AuthApp/AuthApp.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
2424
<PackageReference Include="Microsoft.Extensions.Hosting" />
2525
<PackageReference Include="NetCoreForce.Client" />
26-
<PackageReference Include="TextCopy" Version="1.5.1" />
26+
<PackageReference Include="TextCopy" />
2727
</ItemGroup>
2828
<ItemGroup>
2929
<Content Include="appsettings*.json" CopyToOutputDirectory="PreserveNewest" />

‎src/AuthApp/Host/HttpServer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ await auth.WebServerAsync(
108108

109109
Clipboard.SetText(auth.AccessInfo.RefreshToken);
110110

111-
Console.WriteLine($"Refresh_token copied to the Clipboard", color: Color.WhiteSmoke);
111+
Console.WriteLine($"Refresh_token copied to the Clipboard", color: Color.Yellow);
112112

113113
_isCompleted = true;
114114

‎src/AuthApp/HostBuilderExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ internal static IHostBuilder CreateDefaultBuilder(HostBuilderOptions options)
3939
}
4040

4141
builder
42-
.UseStartupFilter()
42+
.UseStartupFilters()
4343
.ConfigureAppConfiguration((context, config) =>
4444
{
4545
// appsettings file or others

‎src/AuthApp/TokenGeneratorCommand.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ namespace AuthApp
1717
[Command("get-tokens",
1818
Description = "Generates Salesforce Access and Refresh Tokens",
1919
ThrowOnUnexpectedArgument = false)]
20+
[HelpOption("-?")]
2021
internal class TokenGeneratorCommand
2122
{
2223
[Option("--key", Description = "The Salesforce Consumer Key.")]
@@ -60,7 +61,7 @@ internal class TokenGeneratorCommand
6061
[Option("--section", Description ="Configuration Section Name to retrieve the options. The Default value is Salesforce.")]
6162
public string SectionName { get; set; }
6263

63-
private async Task<int> OnExecuteAsync()
64+
private async Task<int> OnExecuteAsync(CommandLineApplication app)
6465
{
6566
var builderConfig = new HostBuilderOptions
6667
{
@@ -95,7 +96,9 @@ private async Task<int> OnExecuteAsync()
9596
}
9697
catch(Microsoft.Extensions.Options.OptionsValidationException exv)
9798
{
98-
Console.WriteLine("Not all of the required configurations has been provided.", Color.Red);
99+
Console.WriteLine($"Not all of the required configurations has been provided. {exv.Message}", Color.Red);
100+
101+
app.ShowHelp();
99102
}
100103
catch (Exception ex)
101104
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netcoreapp2.2;netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;</TargetFrameworks>
55
<RootNamespace>CometD.NetCore2.Salesforce</RootNamespace>
66
</PropertyGroup>
77

0 commit comments

Comments
 (0)