Skip to content

Commit

Permalink
Integrate .NET security patches and other updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Viir committed Jun 16, 2022
1 parent d746eee commit 6746240
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.300'
dotnet-version: '6.0.301'
- name: Try use dotnet core 3
run: dotnet --info
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ steps:
- task: UseDotNet@2
inputs:
packageType: 'sdk' # Options: runtime, sdk
version: '6.0.300'
version: '6.0.301'

- script: dotnet --version

Expand Down
4 changes: 2 additions & 2 deletions implement/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build dotnet build image
FROM mcr.microsoft.com/dotnet/sdk:6.0.300 AS build-env
FROM mcr.microsoft.com/dotnet/sdk:6.0.301 AS build-env
WORKDIR /app

# Copy everything and build
Expand All @@ -8,7 +8,7 @@ WORKDIR /app/elm-fullstack
RUN dotnet publish -c Debug -o out

# Build runtime image
FROM mcr.microsoft.com/dotnet/aspnet:6.0.5 AS binaries
FROM mcr.microsoft.com/dotnet/aspnet:6.0.6 AS binaries

COPY --from=build-env /app/elm-fullstack/out /elm-fullstack/dotnet/

Expand Down
2 changes: 1 addition & 1 deletion implement/elm-fullstack/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace elm_fullstack;

public class Program
{
static public string AppVersionId => "2022-06-09";
static public string AppVersionId => "2022-06-16";

static int AdminInterfaceDefaultPort => 4000;

Expand Down
10 changes: 5 additions & 5 deletions implement/elm-fullstack/elm-fullstack.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>elm_fullstack</RootNamespace>
<AssemblyName>elm-fs</AssemblyName>
<AssemblyVersion>2022.0609.0.0</AssemblyVersion>
<FileVersion>2022.0609.0.0</FileVersion>
<AssemblyVersion>2022.0616.0.0</AssemblyVersion>
<FileVersion>2022.0616.0.0</FileVersion>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand All @@ -20,11 +20,11 @@

<ItemGroup>
<PackageReference Include="FluffySpoon.AspNet.LetsEncrypt" Version="1.116.0" />
<PackageReference Include="JavaScriptEngineSwitcher.V8" Version="3.18.1" />
<PackageReference Include="JavaScriptEngineSwitcher.V8" Version="3.18.3" />
<PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0182" />
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.0.1" />
<PackageReference Include="Microsoft.ClearScript.V8.Native.linux-x64" Version="7.2.5" />
<PackageReference Include="Microsoft.ClearScript.V8.Native.win-x64" Version="7.2.5" />
<PackageReference Include="Microsoft.ClearScript.V8.Native.linux-x64" Version="7.3.0" />
<PackageReference Include="Microsoft.ClearScript.V8.Native.win-x64" Version="7.3.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.3.0-1.final" />
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
Expand Down

0 comments on commit 6746240

Please sign in to comment.