Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit b32f00a9dc2098bc429d1e8d0cd5b774834a6f11
Merge: 6f8a56b bad4811
Author: Giulio Vian <giuliovdev@hotmail.com>
Date:   Sat Sep 12 22:03:27 2020 +0200

    Merge remote-tracking branch 'origin/dependabot/nuget/src/Microsoft.Extensions.Logging-3.1.8' into update-deps

    # Conflicts:
    #	src/aggregator-function/aggregator-function.csproj
    #	src/aggregator-webshared/aggregator-webshared.csproj

commit 6f8a56b0a748a43a5dab67998432f2925578fcb2
Merge: 4d292ce 81759bc
Author: Giulio Vian <giuliovdev@hotmail.com>
Date:   Sat Sep 12 22:02:16 2020 +0200

    Merge remote-tracking branch 'origin/dependabot/nuget/src/Microsoft.Extensions.Configuration.FileExtensions-3.1.8' into update-deps

    # Conflicts:
    #	src/aggregator-function/aggregator-function.csproj
    #	src/aggregator-webshared/aggregator-webshared.csproj

commit 4d292cef95558e107d8f4fbc0bd2c01b4f6a8a9d
Merge: 43f56d9 d092a10
Author: Giulio Vian <giuliovdev@hotmail.com>
Date:   Sat Sep 12 22:01:02 2020 +0200

    Merge remote-tracking branch 'origin/dependabot/nuget/src/Microsoft.AspNetCore.DataProtection-3.1.8' into update-deps

commit 43f56d98fd67384344376480b3b1108e587a166d
Merge: bee2708 c7cdb86
Author: Giulio Vian <giuliovdev@hotmail.com>
Date:   Sat Sep 12 22:00:52 2020 +0200

    Merge remote-tracking branch 'origin/dependabot/nuget/src/Microsoft.Extensions.Logging.Abstractions-3.1.8' into update-deps

commit bad4811
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Sep 12 14:19:02 2020 +0000

    Bump Microsoft.Extensions.Logging from 3.1.6 to 3.1.8 in /src

    Bumps [Microsoft.Extensions.Logging](https://github.com/aspnet/Extensions) from 3.1.6 to 3.1.8.
    - [Release notes](https://github.com/aspnet/Extensions/releases)
    - [Commits](dotnet/extensions@v3.1.6...v3.1.8)

    Signed-off-by: dependabot[bot] <support@github.com>

commit d092a10
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Sep 12 14:19:02 2020 +0000

    Bump Microsoft.AspNetCore.DataProtection from 3.1.7 to 3.1.8 in /src

    Bumps [Microsoft.AspNetCore.DataProtection](https://github.com/aspnet/AspNetCore) from 3.1.7 to 3.1.8.
    - [Release notes](https://github.com/aspnet/AspNetCore/releases)
    - [Commits](dotnet/aspnetcore@v3.1.7...v3.1.8)

    Signed-off-by: dependabot[bot] <support@github.com>

commit 81759bc
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Sep 12 14:19:00 2020 +0000

    Bump Microsoft.Extensions.Configuration.FileExtensions in /src

    Bumps [Microsoft.Extensions.Configuration.FileExtensions](https://github.com/aspnet/Extensions) from 3.1.7 to 3.1.8.
    - [Release notes](https://github.com/aspnet/Extensions/releases)
    - [Commits](dotnet/extensions@v3.1.7...v3.1.8)

    Signed-off-by: dependabot[bot] <support@github.com>

commit c7cdb86
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Sep 12 14:18:59 2020 +0000

    Bump Microsoft.Extensions.Logging.Abstractions in /src

    Bumps [Microsoft.Extensions.Logging.Abstractions](https://github.com/aspnet/Extensions) from 3.1.6 to 3.1.8.
    - [Release notes](https://github.com/aspnet/Extensions/releases)
    - [Commits](dotnet/extensions@v3.1.6...v3.1.8)

    Signed-off-by: dependabot[bot] <support@github.com>

commit bee2708
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Sep 12 14:18:57 2020 +0000

    Bump Microsoft.Extensions.Configuration.Json from 3.1.7 to 3.1.8 in /src

    Bumps [Microsoft.Extensions.Configuration.Json](https://github.com/aspnet/Extensions) from 3.1.7 to 3.1.8.
    - [Release notes](https://github.com/aspnet/Extensions/releases)
    - [Commits](dotnet/extensions@v3.1.7...v3.1.8)

    Signed-off-by: dependabot[bot] <support@github.com>
  • Loading branch information
giuliov committed Sep 12, 2020
1 parent efb6927 commit a33f019
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/aggregator-cli/aggregator-cli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.14.0" />
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.14.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="3.1.7" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="3.1.8" />
<PackageReference Include="Microsoft.Azure.Management.Fluent" Version="1.34.0" />
<PackageReference Include="Microsoft.Azure.Management.ResourceManager.Fluent" Version="1.34.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.8" />
Expand Down
8 changes: 4 additions & 4 deletions src/aggregator-function/aggregator-function.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
<PackageReference Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Version="2.2.0" />
<PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.18" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.7" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.7" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.6" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.8" />
<!-- explicit reference -->
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.6" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.8" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.3" />
<PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="16.153.0" />
<PackageReference Include="Microsoft.VisualStudio.Services.Client" Version="16.153.0" />
Expand Down
8 changes: 4 additions & 4 deletions src/aggregator-webshared/aggregator-webshared.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.7" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.7" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.6" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.8" />
<!-- explicit reference -->
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.6" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.8" />
<PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="16.153.0" />
<PackageReference Include="Microsoft.VisualStudio.Services.Client" Version="16.153.0" />
<PackageReference Include="Microsoft.VisualStudio.Services.ExtensionManagement.WebApi" Version="16.153.0" />
Expand Down

0 comments on commit a33f019

Please sign in to comment.