Merge pull request #647 from Aguafrommars/fix/dependencies

update packages
Aguafrommars · Feb 21, 2022 · 3dd2194 · 3dd2194
2 parents afe0ccf + 6ca51a7
commit 3dd2194
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -47,6 +47,8 @@ jobs:
         include-prerelease: true
     - name: Setup wasm tools
       run: dotnet workload install wasm-tools
+      env: 
+        GITHIB_FEED_TOKEN: ${{ secrets.GITHIB_FEED_TOKEN }}
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -30,10 +30,11 @@ jobs:
           password: ${{ secrets.DOCKER_HUB_PAT }}
       - name: Build and push TheIdServer Duende
         id: docker_build_theidserver_duende
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v2        
         env: 
           GITHIB_FEED_TOKEN: ${{ secrets.GITHIB_FEED_TOKEN }}
         with:
+          build-args: GITHIB_FEED_TOKEN=${{ secrets.GITHIB_FEED_TOKEN }}
           push: true
           file: src/Aguacongas.TheIdServer.Duende/Dockerfile
           tags: aguacongas/theidserver.duende:${{ github.event.release.tag_name || 'next' }}
@@ -55,6 +56,7 @@ jobs:
         env: 
           GITHIB_FEED_TOKEN: ${{ secrets.GITHIB_FEED_TOKEN }}
         with:
+          build-args: GITHIB_FEED_TOKEN=${{ secrets.GITHIB_FEED_TOKEN }}
           push: true
           file: src/Aguacongas.TheIdServer.IS4/Dockerfile
           tags: aguacongas/theidserver:${{ github.event.release.tag_name || 'next' }}
@@ -76,6 +78,7 @@ jobs:
         env: 
           GITHIB_FEED_TOKEN: ${{ secrets.GITHIB_FEED_TOKEN }}
         with:
+          build-args: GITHIB_FEED_TOKEN=${{ secrets.GITHIB_FEED_TOKEN }}
           push: true
           file: src/Aguacongas.TheIdServer.BlazorApp/Dockerfile
           tags: aguacongas/theidserverapp:${{ github.event.release.tag_name || 'next' }}
diff --git a/src/Aguacongas.TheIdServer.BlazorApp/Dockerfile b/src/Aguacongas.TheIdServer.BlazorApp/Dockerfile
@@ -1,3 +1,4 @@
+ARG GITHIB_FEED_TOKEN
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build

diff --git a/src/Aguacongas.TheIdServer.Duende/Dockerfile b/src/Aguacongas.TheIdServer.Duende/Dockerfile
@@ -1,3 +1,4 @@
+ARG GITHIB_FEED_TOKEN
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
 WORKDIR /app

diff --git a/src/Aguacongas.TheIdServer.IS4/Dockerfile b/src/Aguacongas.TheIdServer.IS4/Dockerfile
@@ -1,3 +1,4 @@
+ARG GITHIB_FEED_TOKEN
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
 FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base

diff --git a/...eIdServer.BlazorApp.Infrastructure/Aguacongas.TheIdServer.BlazorApp.Infrastructure.csproj b/...eIdServer.BlazorApp.Infrastructure/Aguacongas.TheIdServer.BlazorApp.Infrastructure.csproj
@@ -29,7 +29,7 @@
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.2" />
 		<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="6.0.2" />
-		<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.15.1" />
+		<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.16.0" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	</ItemGroup>
 

diff --git a/...rver/Aguacongas.IdentityServer.KeysRotation/Aguacongas.IdentityServer.KeysRotation.csproj b/...rver/Aguacongas.IdentityServer.KeysRotation/Aguacongas.IdentityServer.KeysRotation.csproj
@@ -30,7 +30,7 @@
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.2" />
         <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
         <PackageReference Include="MongoDB.Driver" Version="2.14.1" />
-        <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.15.1" />
+        <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.16.0" />
         <PackageReference Include="RavenDB.Client" Version="5.3.100" />
         <PackageReference Include="StackExchange.Redis" Version="2.2.88" />
     </ItemGroup>

diff --git a/...rver/Aguacongas.IdentityServer.WsFederation/Aguacongas.IdentityServer.WsFederation.csproj b/...rver/Aguacongas.IdentityServer.WsFederation/Aguacongas.IdentityServer.WsFederation.csproj
@@ -28,7 +28,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.2.0" />
-		<PackageReference Include="Microsoft.IdentityModel.Protocols.WsFederation" Version="6.15.1" />
+		<PackageReference Include="Microsoft.IdentityModel.Protocols.WsFederation" Version="6.16.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/IdentityServer/Aguacongas.IdentityServer/Aguacongas.IdentityServer.csproj b/src/IdentityServer/Aguacongas.IdentityServer/Aguacongas.IdentityServer.csproj
@@ -42,7 +42,7 @@
 		<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.2" />
 		<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="6.0.2" />
 		<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="6.0.2" />
-		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.15.1" />
+		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.16.0" />
 	</ItemGroup>
 
 	<ItemGroup>