Skip to content

Commit 3113173

Browse files
author
Mark Hall
authored
Merge pull request #26 from episerver/feature/Upgrade-Episerver-and-Multitargeting
Update Episerver packages, target IndexingService to .NET 7
2 parents 1ac26d7 + 556d1dd commit 3113173

File tree

16 files changed

+67
-59
lines changed

16 files changed

+67
-59
lines changed

‎.github/workflows/ci-client.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,20 @@ jobs:
2323
versionSuffix: ${{ github.ref == 'refs/heads/develop' && 'pre-' || 'ci-' }}${{github.RUN_NUMBER }}
2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@v1
27-
- name: Setup .NET Core @ Latest
28-
uses: actions/setup-dotnet@v1
26+
uses: actions/checkout@v3
27+
- name: Setup .NET
28+
uses: actions/setup-dotnet@v3
2929
with:
30+
dotnet-version: '7.0.x'
3031
source-url: https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json
3132
env:
3233
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
33-
34+
3435
- name: Restore
3536
run: dotnet restore
3637
- name: Build (Release version)
3738
if: ${{ github.ref == 'refs/heads/main' }}
38-
run: dotnet build --no-restore --configuration $env:buildConfiguration
39+
run: dotnet build --no-restore --configuration $env:buildConfiguration
3940
- name: Build (Pre-Release version)
4041
if: ${{ github.ref != 'refs/heads/main' }}
4142
run: dotnet build --no-restore --configuration $env:buildConfiguration --version-suffix $env:versionSuffix

‎.github/workflows/ci-service.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
# - 'src/EPiServer.Search.IndexingService/**'
1111
# - 'test/EPiServer.Search.IndexingService.Test/**'
1212
# - 'docker-compose.yml'
13-
13+
1414
jobs:
1515
build_test_pack:
1616
name: Build, test & push image
@@ -23,9 +23,11 @@ jobs:
2323
IMAGE_NAME: ${{ github.repository }}
2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@v1
27-
- name: Setup .NET Core @ Latest
28-
uses: actions/setup-dotnet@v1
26+
uses: actions/checkout@v3
27+
- name: Setup .NET
28+
uses: actions/setup-dotnet@v3
29+
with:
30+
dotnet-version: '7.0.x'
2931
- name: Restore
3032
run: dotnet restore
3133
- name: Test

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,4 +179,5 @@ EPiServer.Search.Cms.zip
179179
sample/AlloyMvcTemplate/App_Data/**
180180
sample/AlloyMvcTemplate/App_Code/**
181181
/nupkgs
182-
/modules
182+
/modules
183+
.idea

‎Directory.Build.props‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
<Import Project="build\version.props" />
33

44
<PropertyGroup>
5-
<TargetFramework>net5.0</TargetFramework>
6-
<LangVersion>9.0</LangVersion>
7-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
5+
<TargetFramework>net6.0</TargetFramework>
6+
<LangVersion>latest</LangVersion>
87
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
98
<EnableNETAnalyzers>true</EnableNETAnalyzers>
109
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>

‎build/dependencies.props‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
<Project>
22
<PropertyGroup>
3-
<CmsVersion>12.5.0</CmsVersion>
4-
<CmsUiCoreVersion>[12.5.0,13)</CmsUiCoreVersion>
3+
<CmsVersion>[12.17.1,13)</CmsVersion>
4+
<CmsCoreVersion>[12.13.1,13)</CmsCoreVersion>
5+
<CmsUiCoreVersion>[12.17.1,13)</CmsUiCoreVersion>
56
<Lucene>4.8.0-beta00015</Lucene>
67
</PropertyGroup>
78
<ItemGroup Condition = "'$(TargetFramework)' != 'net461'">
89
<PackageReference Update="EPiServer.CMS" Version="$(CmsVersion)" />
9-
<PackageReference Update="EPiServer.Hosting" Version="$(CmsUiCoreVersion)" />
10+
<PackageReference Update="EPiServer.Hosting" Version="$(CmsCoreVersion)" />
1011
<PackageReference Update="EPiServer.CMS.UI.Core" Version="$(CmsUiCoreVersion)" />
11-
<PackageReference Update="EPiServer.CMS.AspNetCore.Templating" Version="$(CmsUiCoreVersion)" />
12-
<PackageReference Update="EPiServer.CMS.AspNetCore.HtmlHelpers" Version="$(CmsUiCoreVersion)" />
12+
<PackageReference Update="EPiServer.CMS.AspNetCore.Templating" Version="$(CmsCoreVersion)" />
13+
<PackageReference Update="EPiServer.CMS.AspNetCore.HtmlHelpers" Version="$(CmsCoreVersion)" />
1314
</ItemGroup>
1415
</Project>

‎build/version.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<!-- This file may be overwritten by automation. Only values allowed here are VersionPrefix and VersionSuffix. -->
22
<Project>
33
<PropertyGroup>
4-
<VersionPrefix>10.0.0</VersionPrefix>
4+
<VersionPrefix>10.1.0</VersionPrefix>
55
<VersionSuffix>
66
</VersionSuffix>
77
</PropertyGroup>
8-
</Project>
8+
</Project>

‎docker-compose.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ services:
44
search:
55
build:
66
dockerfile: ./src/EPiServer.Search.IndexingService/Search.Dockerfile
7-
context: .
7+
context: .
88
environment:
99
ASPNETCORE_URLS: http://*:80
1010
ASPNETCORE_ENVIRONMENT: Production
11-
11+
1212
ports:
1313
- 5000:80
1414
image: episerver.search.indexingservice:latest
15-
container_name: EPiServer.Search.IndexingService
15+
container_name: EPiServer.Search.IndexingService
1616
volumes:
1717
- shared-folder:/app/App_Data
1818

1919
volumes:
20-
shared-folder:
20+
shared-folder:

‎global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
3-
"version": "6.0.100",
4-
"architecture": "x64",
5-
"rollForward": "minor"
3+
"version": "7.0.0",
4+
"rollForward": "latestMajor",
5+
"allowPrerelease": false
66
}
7-
}
7+
}

‎sample/AlloyMvcTemplate/AlloyMvcTemplates.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
32
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
54
<NoWarn>NU5100</NoWarn>
65
</PropertyGroup>
76
<ItemGroup>
87
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
98
<PackageReference Include="Wangkanai.Detection" Version="2.0.1" />
10-
<PackageReference Include="Serilog" Version="2.10.0" />
11-
<PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
12-
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
9+
<PackageReference Include="Serilog" Version="2.12.0" />
10+
<PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
11+
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
1312
<PackageReference Include="EPiServer.CMS" />
1413
<PackageReference Include="EPiServer.Hosting" />
1514
<PackageReference Include="EPiServer.CMS.AspNetCore.HtmlHelpers" />

‎src/EPiServer.Search.Cms/EPiServer.Search.Cms.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<PropertyGroup>
33
<TargetFramework>net6.0</TargetFramework>
44
</PropertyGroup>
5-
<Import Project="$(BuildDirectory)public.props" />
65
<ItemGroup>
76
<None Remove="Resources\language.xml" />
87
</ItemGroup>

0 commit comments

Comments
 (0)