Skip to content

Commit 76696df

Browse files
habarthierry-huehabarthierry-hue
committed
Ticket #771 : Fix build + update default.ps1 file
1 parent 7049077 commit 76696df

22 files changed

Lines changed: 13520 additions & 53 deletions

File tree

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<VersionPrefix>5.0.0</VersionPrefix>
3+
<VersionPrefix>5.0.1</VersionPrefix>
44
<Authors>SimpleIdServer</Authors>
55
<Owners>SimpleIdServer</Owners>
66
</PropertyGroup>

‎default.ps1‎

Lines changed: 46 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ task compile -depends clean {
165165
exec { dotnet build .\SimpleIdServer.Scim.Host.sln -c $config --version-suffix=$buildSuffix }
166166
exec { dotnet build .\SimpleIdServer.Did.sln -c $config --version-suffix=$buildSuffix }
167167
exec { dotnet build .\SimpleIdServer.CredentialIssuer.Host.sln -c $config --version-suffix=$buildSuffix }
168+
exec { dotnet build .\SimpleIdServer.Federation.sln -c $config --version-suffix=$buildSuffix }
168169
exec { dotnet build "$source_dir/Templates/SimpleIdServer.Templates.csproj" -c $config --version-suffix=$buildSuffix }
169170
}
170171

@@ -188,7 +189,7 @@ task buildTemplate {
188189
CopyFolder $CredentialIssuerWebsitePathSource $CredentialIssuerWebsitePathTarget
189190
}
190191

191-
task pack -depends release, compile, buildTemplate {
192+
task pack -depends release, compile {
192193
exec { dotnet pack $source_dir\IdServer\SimpleIdServer.IdServer.VerifiablePresentation\SimpleIdServer.IdServer.VerifiablePresentation.csproj -c $config --no-build $versionSuffix --output $result_dir }
193194
exec { dotnet pack $source_dir\IdServer\SimpleIdServer.IdServer\SimpleIdServer.IdServer.csproj -c $config --no-build $versionSuffix --output $result_dir }
194195
exec { dotnet pack $source_dir\IdServer\SimpleIdServer.IdServer.Domains\SimpleIdServer.IdServer.Domains.csproj -c $config --no-build $versionSuffix --output $result_dir }
@@ -222,6 +223,8 @@ task pack -depends release, compile, buildTemplate {
222223
exec { dotnet pack $source_dir\IdServer\SimpleIdServer.OpenidFederation\SimpleIdServer.OpenidFederation.csproj -c $config --no-build $versionSuffix --output $result_dir }
223224
exec { dotnet pack $source_dir\IdServer\SimpleIdServer.OpenidFederation.Store.EF\SimpleIdServer.OpenidFederation.Store.EF.csproj -c $config --no-build $versionSuffix --output $result_dir }
224225
exec { dotnet pack $source_dir\IdServer\SimpleIdServer.IdServer.Federation\SimpleIdServer.IdServer.Federation.csproj -c $config --no-build $versionSuffix --output $result_dir }
226+
exec { dotnet pack $source_dir\IdServer\SimpleIdServer.Authority.Federation\SimpleIdServer.Authority.Federation.csproj -c $config --no-build $versionSuffix --output $result_dir }
227+
exec { dotnet pack $source_dir\IdServer\SimpleIdServer.Rp.Federation\SimpleIdServer.Rp.Federation.csproj -c $config --no-build $versionSuffix --output $result_dir }
225228
exec { dotnet pack $source_dir\Scim\SimpleIdServer.Scim\SimpleIdServer.Scim.csproj -c $config --no-build $versionSuffix --output $result_dir }
226229
exec { dotnet pack $source_dir\Scim\SimpleIdServer.Scim.Domains\SimpleIdServer.Scim.Domains.csproj -c $config --no-build $versionSuffix --output $result_dir }
227230
exec { dotnet pack $source_dir\Scim\SimpleIdServer.Scim.Parser\SimpleIdServer.Scim.Parser.csproj -c $config --no-build $versionSuffix --output $result_dir }
@@ -246,79 +249,86 @@ task pack -depends release, compile, buildTemplate {
246249
}
247250

248251
task test {
249-
Push-Location -Path $base_dir\tests\SimpleIdServer.Configuration.Tests
250-
251-
try {
252-
exec { & dotnet test -c $config --no-build --no-restore }
253-
} finally {
254-
Pop-Location
255-
}
252+
Push-Location -Path $base_dir\tests\SimpleIdServer.Configuration.Tests
256253

257-
Push-Location -Path $base_dir\tests\SimpleIdServer.CredentialIssuer.Host.Acceptance.Tests
258-
259-
try {
260-
exec { & dotnet test -c $config --no-build --no-restore }
261-
} finally {
262-
Pop-Location
263-
}
254+
try {
255+
exec { & dotnet test -c $config --no-build --no-restore }
256+
} finally {
257+
Pop-Location
258+
}
264259

265-
Push-Location -Path $base_dir\tests\SimpleIdServer.Did.Ethr.Tests
266-
267-
try {
268-
exec { & dotnet test -c $config --no-build --no-restore }
269-
} finally {
270-
Pop-Location
271-
}
260+
Push-Location -Path $base_dir\tests\SimpleIdServer.CredentialIssuer.Host.Acceptance.Tests
272261

273-
Push-Location -Path $base_dir\tests\SimpleIdServer.Did.Key.Tests
274-
275-
try {
276-
exec { & dotnet test -c $config --no-build --no-restore }
277-
} finally {
278-
Pop-Location
279-
}
262+
try {
263+
exec { & dotnet test -c $config --no-build --no-restore }
264+
} finally {
265+
Pop-Location
266+
}
267+
268+
Push-Location -Path $base_dir\tests\SimpleIdServer.Did.Ethr.Tests
269+
270+
try {
271+
exec { & dotnet test -c $config --no-build --no-restore }
272+
} finally {
273+
Pop-Location
274+
}
275+
276+
Push-Location -Path $base_dir\tests\SimpleIdServer.Did.Key.Tests
277+
278+
try {
279+
exec { & dotnet test -c $config --no-build --no-restore }
280+
} finally {
281+
Pop-Location
282+
}
283+
284+
Push-Location -Path $base_dir\tests\SimpleIdServer.DID.Tests
285+
286+
try {
287+
exec { & dotnet test -c $config --no-build --no-restore }
288+
} finally {
289+
Pop-Location
290+
}
280291

281-
Push-Location -Path $base_dir\tests\SimpleIdServer.DID.Tests
292+
Push-Location -Path $base_dir\tests\SimpleIdServer.IdServer.Host.Acceptance.Tests
282293

283294
try {
284295
exec { & dotnet test -c $config --no-build --no-restore }
285296
} finally {
286297
Pop-Location
287298
}
288-
289-
Push-Location -Path $base_dir\tests\SimpleIdServer.IdServer.Host.Acceptance.Tests
299+
Push-Location -Path $base_dir\tests\SimpleIdServer.IdServer.Tests
290300

291301
try {
292302
exec { & dotnet test -c $config --no-build --no-restore }
293303
} finally {
294304
Pop-Location
295305
}
296306

297-
Push-Location -Path $base_dir\tests\SimpleIdServer.IdServer.Tests
307+
Push-Location -Path $base_dir\tests\SimpleIdServer.Scim.Host.Acceptance.Tests
298308

299309
try {
300310
exec { & dotnet test -c $config --no-build --no-restore }
301311
} finally {
302312
Pop-Location
303313
}
304314

305-
Push-Location -Path $base_dir\tests\SimpleIdServer.Scim.Host.Acceptance.Tests
315+
Push-Location -Path $base_dir\tests\SimpleIdServer.Scim.Tests
306316

307317
try {
308318
exec { & dotnet test -c $config --no-build --no-restore }
309319
} finally {
310320
Pop-Location
311321
}
312322

313-
Push-Location -Path $base_dir\tests\SimpleIdServer.Scim.Tests
323+
Push-Location -Path $base_dir\tests\SimpleIdServer.Vc.Tests
314324

315325
try {
316326
exec { & dotnet test -c $config --no-build --no-restore }
317327
} finally {
318328
Pop-Location
319329
}
320330

321-
Push-Location -Path $base_dir\tests\SimpleIdServer.Vc.Tests
331+
Push-Location -Path $base_dir\tests\SimpleIdServer.OpenidFederation.Tests
322332

323333
try {
324334
exec { & dotnet test -c $config --no-build --no-restore }

‎src/Did/SimpleIdServer.Did/Crypto/SecurityKeys/Ed25519SecurityKey.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class Ed25519SecurityKey : AsymmetricSecurityKey
1414

1515
public Ed25519SecurityKey()
1616
{
17-
CryptoProviderFactory.CustomCryptoProvider = new Ed25519CryptoProvider();
17+
this.CryptoProviderFactory.CustomCryptoProvider = new Ed25519CryptoProvider();
1818
}
1919

2020
public Ed25519SecurityKey(Ed25519PublicKeyParameters publicKey, Ed25519PrivateKeyParameters privateKey = null) : this()

‎src/IdServer/SimpleIdServer.IdServer.ConformanceSuite.Startup/Converters/FacebookOptionsLite.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ namespace SimpleIdServer.IdServer.ConformanceSuite.Startup.Converters
77
{
88
public class FacebookOptionsLite : IDynamicAuthenticationOptions<FacebookOptions>
99
{
10-
[SimpleIdServer.Configuration.ConfigurationRecord("AppId", "Application identifier", 0)]
10+
[SimpleIdServer.IdServer.ConfigurationRecord("AppId", "Application identifier", 0)]
1111
public string AppId { get; set; }
12-
[SimpleIdServer.Configuration.ConfigurationRecord("AppSecret", "Application secret", 1, null, Configuration.CustomConfigurationRecordType.PASSWORD)]
12+
[SimpleIdServer.IdServer.ConfigurationRecord("AppSecret", "Application secret", 1, null, SimpleIdServer.IdServer.CustomConfigurationRecordType.PASSWORD)]
1313
public string AppSecret { get; set; }
1414

1515
public FacebookOptions Convert() => new FacebookOptions

‎src/IdServer/SimpleIdServer.IdServer.ConformanceSuite.Startup/Converters/OpenIdConnectLiteOptions.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ namespace SimpleIdServer.IdServer.ConformanceSuite.Startup.Converters
77
{
88
public class OpenIdConnectLiteOptions : IDynamicAuthenticationOptions<OpenIdConnectOptions>
99
{
10-
[SimpleIdServer.Configuration.ConfigurationRecord("ClientId", "Client Identifier", order: 0)]
10+
[SimpleIdServer.IdServer.ConfigurationRecord("ClientId", "Client Identifier", order: 0)]
1111
public string ClientId { get; set; }
12-
[SimpleIdServer.Configuration.ConfigurationRecord("ClientSecret", "Client Secret", order: 1)]
12+
[SimpleIdServer.IdServer.ConfigurationRecord("ClientSecret", "Client Secret", order: 1)]
1313
public string ClientSecret { get; set; }
1414

1515
public OpenIdConnectOptions Convert()

0 commit comments

Comments
 (0)