Skip to content

Commit

Permalink
[SqlTableDependency.Extensions]: solution was migrated to net7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tomasfabian committed Dec 19, 2023
1 parent ee8f194 commit 1504111
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/dotnetcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:

- uses: actions/checkout@v2

- name: Setup .NET 6.0
- name: Setup .NET 7.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.x
dotnet-version: 7.0.x

- name: Clean
run: dotnet clean Joker.sln --configuration Release && dotnet nuget locals all --clear
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<!--<TargetFramework>net8.0</TargetFramework>-->
<!--<TargetFramework>net7.0</TargetFramework>-->
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion ProjectDefinitions/Constants.csprojimport
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<NetStandardVersion>netstandard2.0</NetStandardVersion>
<DotNetVersion>net6.0</DotNetVersion>
<DotNetVersion>net7.0</DotNetVersion>
<DotNetWindowsVersion>net5.0-windows10.0.19041</DotNetWindowsVersion>
<DotNetFrameworkVersion>net472</DotNetFrameworkVersion>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions Samples/OData/SelfHostedODataService.EFCore/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#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
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
WORKDIR /app
EXPOSE 80
EXPOSE 443

FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
WORKDIR /src
COPY ["nuget.config", "."]
COPY ["Samples/OData/SelfHostedODataService.EFCore/SelfHostedODataService.EFCore.csproj", "Samples/OData/SelfHostedODataService.EFCore/"]
Expand Down
4 changes: 2 additions & 2 deletions Samples/OData/SelfHostedODataService/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#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
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
WORKDIR /app
EXPOSE 80
EXPOSE 443

FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
WORKDIR /src
COPY ["nuget.config", "."]
COPY ["Samples/OData/SelfHostedODataService/SelfHostedODataService.csproj", "Samples/OData/SelfHostedODataService/"]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<Import Project="..\..\..\ProjectDefinitions\Constants.csprojimport" />
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>$(DotNetVersion)</TargetFrameworks>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<DockerfileContext>..\..\..</DockerfileContext>
<UserSecretsId>780e3d94-afd4-4a43-9798-b82383b2530e</UserSecretsId>
Expand Down

0 comments on commit 1504111

Please sign in to comment.