Skip to content

Commit

Permalink
Apply recommended patches
Browse files Browse the repository at this point in the history
  • Loading branch information
Viir committed Jun 14, 2023
1 parent b7997c6 commit daf972c
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish-to-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.203'
dotnet-version: '7.0.304'

- name: Try use dotnet
run: dotnet --info
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.203'
dotnet-version: '7.0.304'

- name: Try use dotnet
run: dotnet --info
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: '7.0.203'
version: '7.0.304'
includePreviewVersions: true

- 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:7.0.203 AS build-env
FROM mcr.microsoft.com/dotnet/sdk:7.0.304 AS build-env
WORKDIR /app

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

# Build runtime image
FROM mcr.microsoft.com/dotnet/aspnet:7.0.5 AS binaries
FROM mcr.microsoft.com/dotnet/aspnet:7.0.7 AS binaries

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

Expand Down
12 changes: 6 additions & 6 deletions implement/elm-time/JavaScript/ClearScript.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,23 @@ public class ClearScriptV8
OSPlatform.Linux,
ImmutableList.Create(
new DependencyFile(
HashBase16: "0a1aa724e021de144d26ceb846fe13d436db95425e8d2a151ad1583aa9ce0263",
HashBase16: "4524f101eceed4c6b0344a4cb67b19443f1d42e9f3e2f27b5cb68b007c947409",
ExpectedFileName: "ClearScriptV8.linux-x64.so",
RemoteSources: new[] { "https://www.nuget.org/api/v2/package/Microsoft.ClearScript.V8.Native.linux-x64/7.4.1" })))
RemoteSources: new[] { "https://www.nuget.org/api/v2/package/Microsoft.ClearScript.V8.Native.linux-x64/7.4.2" })))
.Add(
OSPlatform.Windows,
ImmutableList.Create(
new DependencyFile(
HashBase16: "eeda680f30f6f27ed57a20f41d6208f9022408e66f9e6092864586927fe6e4b4",
HashBase16: "6ef8e937639a25554be8f60830c47b720d432b8ac47b7b54d82214d1d4083d34",
ExpectedFileName: "ClearScriptV8.win-x64.dll",
RemoteSources: new[] { "https://www.nuget.org/api/v2/package/Microsoft.ClearScript.V8.Native.win-x64/7.4.1" })))
RemoteSources: new[] { "https://www.nuget.org/api/v2/package/Microsoft.ClearScript.V8.Native.win-x64/7.4.2" })))
.Add(
OSPlatform.OSX,
ImmutableList.Create(
new DependencyFile(
HashBase16: "3438d1f682e119ad0df6cb37c83c7c53d103d46cc333343de2f1dd5b89ba84ad",
HashBase16: "e9e13385c02554fa7c76d1df0307a0ca6825eff0b641ddf7826e3fbf9a546794",
ExpectedFileName: "ClearScriptV8.osx-x64.dylib",
RemoteSources: new[] { "https://www.nuget.org/api/v2/package/Microsoft.ClearScript.V8.Native.osx-x64/7.4.1" })));
RemoteSources: new[] { "https://www.nuget.org/api/v2/package/Microsoft.ClearScript.V8.Native.osx-x64/7.4.2" })));

public static readonly Lazy<Task> SetupTask = new(() =>
{
Expand Down
8 changes: 4 additions & 4 deletions implement/elm-time/elm-time.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@

<ItemGroup>
<PackageReference Include="FluffySpoon.AspNet.LetsEncrypt" Version="1.116.0" />
<PackageReference Include="JavaScriptEngineSwitcher.V8" Version="3.21.1" />
<PackageReference Include="JavaScriptEngineSwitcher.V8" Version="3.21.3" />
<PackageReference Include="Jint" Version="3.0.0-beta-2049" />
<PackageReference Include="LibGit2Sharp" Version="0.27.2" />
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.0.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.5.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.5" />
<PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.6.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.7" />
<PackageReference Include="MSTest.TestFramework" Version="3.0.4" />
<PackageReference Include="ReadLine" Version="2.0.1" />
<PackageReference Include="SharpCompress" Version="0.33.0" />
<PackageReference Include="TupleAsJsonArray" Version="1.0.2" />
Expand Down
10 changes: 5 additions & 5 deletions implement/test-elm-time/test-elm-time.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
<PackageReference Include="FluentAssertions" Version="6.11.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
<PackageReference Include="morelinq" Version="3.3.2" />
<PackageReference Include="MSTest.TestAdapter" Version="3.0.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PackageReference Include="MSTest.TestAdapter" Version="3.0.4" />
<PackageReference Include="MSTest.TestFramework" Version="3.0.4" />
<PackageReference Include="coverlet.collector" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down

0 comments on commit daf972c

Please sign in to comment.