Skip to content

Commit e087b31

Browse files
committed
RSA deprecation
1 parent 4047242 commit e087b31

File tree

119 files changed

+24952
-12997
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+24952
-12997
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*.h text
88

99
# Declare files that will always have CRLF line endings on checkout.
10+
* text=auto eol=lf
1011
*.sln text eol=crlf
1112

1213
# Denote all files that are truly binary and should not be modified.

.github/workflows/build.yml

Lines changed: 30 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
name: Build Keeper SDK for .NET
22

33
on:
4-
# push:
5-
# branches:
6-
# - 'release_*'
74
workflow_dispatch:
85
inputs:
9-
sqlite_storage:
10-
description: Build SQLite Vault storage
11-
type: boolean
12-
required: false
13-
default: false
146
cli:
157
description: Build CLI package
168
type: boolean
@@ -43,12 +35,7 @@ jobs:
4335
- uses: actions/setup-dotnet@v4
4436
with:
4537
dotnet-version: '8.0.x'
46-
- uses: microsoft/setup-msbuild@v2
47-
48-
- uses: nuget/setup-nuget@v2
49-
- run: nuget restore KeeperSdk.sln
50-
51-
38+
5239
- name: Load signing certificate
5340
run: |
5441
if (Test-Path -Path certificate.txt) { Remove-Item certificate.txt }
@@ -58,25 +45,21 @@ jobs:
5845
Remove-Item certificate.txt
5946
shell: powershell
6047

48+
- name: Restore solution
49+
run: |
50+
dotnet restore KeeperSdk.sln
51+
shell: powershell
52+
6153
- name: Build Keeper SDK Nuget package
6254
working-directory: ./KeeperSdk
6355
run: |
6456
if (Test-Path bin) { Remove-Item -Force -Recurse bin }
6557
dotnet build /P:Configuration=Release /P:Version=${Env:PACKAGE_VERSION} /P:AssemblyVersion=${Env:BUILD_VERSION} /P:FileVersion=${Env:BUILD_VERSION}
66-
& 'C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x86/signtool.exe' sign /f ..\certificate.pfx /t "http://timestamp.digicert.com" /v /p "${{ secrets.PFX_PASS }}" /d ".NET Keeper SDK" "bin\Release\net452\KeeperSdk.dll"
6758
& 'C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x86/signtool.exe' sign /f ..\certificate.pfx /t "http://timestamp.digicert.com" /v /p "${{ secrets.PFX_PASS }}" /d ".NET Keeper SDK" "bin\Release\netstandard2.0\KeeperSdk.dll"
59+
& 'C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x86/signtool.exe' sign /f ..\certificate.pfx /t "http://timestamp.digicert.com" /v /p "${{ secrets.PFX_PASS }}" /d ".NET Keeper SDK" "bin\Release\net8.0\KeeperSdk.dll"
6860
dotnet pack --no-build --no-restore --no-dependencies /P:Configuration=Release /P:Version=${Env:PACKAGE_VERSION} /P:IncludeSymbols=true /P:SymbolPackageFormat=snupkg
6961
shell: powershell
7062

71-
- name: Build SQLite Vault Storage
72-
working-directory: ./OfflineStorageSqlite
73-
run: |
74-
if (Test-Path bin) { Remove-Item -Force -Recurse bin }
75-
dotnet build --configuration=Release --no-dependencies
76-
& 'C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x86/signtool.exe' sign /f ..\certificate.pfx /t "http://timestamp.digicert.com" /v /p "${{ secrets.PFX_PASS }}" /d ".NET Keeper SDK Offline SQLite Storage" "bin\Release\\netstandard2.0\OfflineStorageSqlite.dll"
77-
dotnet pack --no-build --no-restore --configuration=Release /P:IncludeSymbols=true /P:SymbolPackageFormat=snupkg
78-
shell: powershell
79-
8063
- name: Build CLI library
8164
working-directory: ./Cli
8265
run: |
@@ -91,17 +74,29 @@ jobs:
9174
working-directory: ./Commander
9275
run: |
9376
if (Test-Path bin) { Remove-Item -Force -Recurse bin }
94-
msbuild /T:Restore /P:Configuration=Release
95-
msbuild /T:Build /P:Configuration=Release /p:BuildProjectReferences=false
96-
& 'C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x86/signtool.exe' sign /f ..\certificate.pfx /t "http://timestamp.digicert.com" /v /p "${{ secrets.PFX_PASS }}" /d ".NET Keeper SDK" "bin\Release\Commander.exe"
77+
dotnet build --configuration=Release --no-dependencies
78+
& 'C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x86/signtool.exe' sign /f ..\certificate.pfx /t "http://timestamp.digicert.com" /v /p "${{ secrets.PFX_PASS }}" /d ".NET Keeper SDK" "bin\Release\net472\Commander.exe"
79+
& 'C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x86/signtool.exe' sign /f ..\certificate.pfx /t "http://timestamp.digicert.com" /v /p "${{ secrets.PFX_PASS }}" /d ".NET Keeper SDK" "bin\Release\net8.0\Commander.dll"
9780
shell: powershell
9881

99-
- name: Zip Commander
82+
- name: Zip .Net Framework Commander
83+
working-directory: "./Commander/bin/Release/net472"
10084
run: |
10185
$params = @{
102-
Path = "Commander/bin/Release/*.exe", "Commander/bin/Release/Commander.exe.config", "Commander/bin/Release/*.dll", "OfflineStorageSqlite/bin/Release/netstandard2.0/OfflineStorageSqlite.dll"
86+
Path = "*.exe", "Commander.exe.config", "*.dll", "x64/", "x86/"
10387
CompressionLevel = "Fastest"
104-
DestinationPath = "Commander-${Env:PACKAGE_VERSION}.zip"
88+
DestinationPath = "Commander-win-${Env:PACKAGE_VERSION}.zip"
89+
}
90+
Compress-Archive @params
91+
shell: powershell
92+
93+
- name: Zip .Net 8.0 Commander
94+
working-directory: "./Commander/bin/Release/net8.0"
95+
run: |
96+
$params = @{
97+
Path = "*.dll", "Commander.dll.config", "Commander.deps.json", "runtimes/", "Commander.runtimeconfig.json"
98+
CompressionLevel = "Fastest"
99+
DestinationPath = "Commander-net-${Env:PACKAGE_VERSION}.zip"
105100
}
106101
Compress-Archive @params
107102
shell: powershell
@@ -118,18 +113,15 @@ jobs:
118113
- name: Store Commander artifacts
119114
uses: actions/upload-artifact@v4
120115
with:
121-
name: Commander-${{ env.PACKAGE_VERSION }}
122-
path: Commander-${{ env.PACKAGE_VERSION }}.zip
116+
name: Commander-win-${{ env.PACKAGE_VERSION }}
117+
path: Commander/bin/Release/net472/Commander-win-${{ env.PACKAGE_VERSION }}.zip
123118
retention-days: 1
124119

125-
- name: Store SQLite Offline Storage artifacts
126-
if: ${{ inputs.sqlite_storage }}
120+
- name: Store Commander artifacts
127121
uses: actions/upload-artifact@v4
128122
with:
129-
name: OfflineStorageSqlite
130-
path: |
131-
OfflineStorageSqlite/bin/Release/Keeper.Storage.Sqlite.*.nupkg
132-
OfflineStorageSqlite/bin/Release/Keeper.Storage.Sqlite.*.snupkg
123+
name: Commander-net-${{ env.PACKAGE_VERSION }}
124+
path: Commander/bin/Release/net6.0/Commander-net-${{ env.PACKAGE_VERSION }}.zip
133125
retention-days: 1
134126

135127
- name: Store artifacts

Cli/Cli.csproj

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
4+
<TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
55
<RootNamespace>Cli</RootNamespace>
6-
<Version>1.0.2</Version>
6+
<Version>1.0.3</Version>
77
<PackageId>Keeper.Cli</PackageId>
8-
<AssemblyVersion>1.0.2.3</AssemblyVersion>
9-
<FileVersion>1.0.2.3</FileVersion>
8+
<AssemblyVersion>1.0.3.4</AssemblyVersion>
9+
<FileVersion>1.0.3.4</FileVersion>
1010
<RepositoryUrl>https://github.com/Keeper-Security/keeper-sdk-dotnet</RepositoryUrl>
1111
<PackageProjectUrl>https://github.com/Keeper-Security/keeper-sdk-dotnet/Cli</PackageProjectUrl>
1212
<Authors>Keeper Security Inc.</Authors>
@@ -19,10 +19,6 @@
1919
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
2020
</PropertyGroup>
2121

22-
<ItemGroup>
23-
<PackageReference Include="CommandLineParser" Version="2.9.1" />
24-
</ItemGroup>
25-
2622
<ItemGroup>
2723
<ProjectReference Include="..\KeeperSdk\KeeperSdk.csproj" />
2824
</ItemGroup>

0 commit comments

Comments
 (0)