Skip to content
This repository was archived by the owner on Feb 10, 2024. It is now read-only.

Commit 2f37e4d

Browse files
skttlskttl
committed
Prepare for v10.0.0
1 parent 32790cd commit 2f37e4d

23 files changed

+136
-111
lines changed

‎.github/workflows/ci.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
on:
2+
push:
3+
branches:
4+
- master
5+
pull_request:
6+
branches:
7+
- master
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
defaults:
12+
run:
13+
working-directory: ./src
14+
timeout-minutes: 5
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v2
18+
- name: Build
19+
run: dotnet build --configuration Release

‎.github/workflows/release-preview.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
on:
2+
push:
3+
tags:
4+
- "v[0-9]+.[0-9]+.[0-9]+-[a-z]*[0-9][0-9][0-9]"
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
defaults:
9+
run:
10+
working-directory: ./src
11+
timeout-minutes: 15
12+
env:
13+
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v2
17+
- name: Set VERSION variable from tag
18+
run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV
19+
- name: Pack
20+
run: dotnet pack --configuration Release /p:Version=${VERSION} --output .
21+
- name: Push
22+
run: dotnet nuget push Our.Umbraco.DocTypeGridEditor.${VERSION}.nupkg --api-key ${NUGET_API_KEY} --source https://api.nuget.org/v3/index.json

‎.github/workflows/release.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
on:
2+
push:
3+
tags:
4+
- "v[0-9]+.[0-9]+.[0-9]+"
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
defaults:
9+
run:
10+
working-directory: ./src
11+
timeout-minutes: 15
12+
env:
13+
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v2
17+
- name: Verify commit exists in origin/master
18+
run: |
19+
git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
20+
git branch --remote --contains | grep origin/master
21+
- name: Set VERSION variable from tag
22+
run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV
23+
- name: Build
24+
run: dotnet build --configuration Release /p:Version=${VERSION}
25+
- name: Pack
26+
run: dotnet pack --configuration Release /p:Version=${VERSION} --no-build --output .
27+
- name: Push
28+
run: dotnet nuget push Our.Umbraco.DocTypeGridEditor.${VERSION}.nupkg --api-key ${NUGET_API_KEY} --source https://api.nuget.org/v3/index.json

‎src/Our.Umbraco.DocTypeGridEditor.sln

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.30711.63
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.32014.148
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Our.Umbraco.DocTypeGridEditor", "Our.Umbraco.DocTypeGridEditor\Our.Umbraco.DocTypeGridEditor.csproj", "{D4318AFD-033C-46FC-9DD2-9FC57934CD2F}"
77
EndProject
@@ -13,8 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1313
..\README.md = ..\README.md
1414
EndProjectSection
1515
EndProject
16-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dtge9Testsite", "Dtge9Testsite\Dtge9Testsite.csproj", "{7C24F7A4-D89C-4E48-BC0C-CE8EA2674A10}"
17-
EndProject
1816
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{8E6B61BE-CD4E-4C09-B386-81AF21ABE55D}"
1917
ProjectSection(SolutionItems) = preProject
2018
..\docs\developers-guide-v1.md = ..\docs\developers-guide-v1.md
@@ -32,10 +30,6 @@ Global
3230
{D4318AFD-033C-46FC-9DD2-9FC57934CD2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
3331
{D4318AFD-033C-46FC-9DD2-9FC57934CD2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
3432
{D4318AFD-033C-46FC-9DD2-9FC57934CD2F}.Release|Any CPU.Build.0 = Release|Any CPU
35-
{7C24F7A4-D89C-4E48-BC0C-CE8EA2674A10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
36-
{7C24F7A4-D89C-4E48-BC0C-CE8EA2674A10}.Debug|Any CPU.Build.0 = Debug|Any CPU
37-
{7C24F7A4-D89C-4E48-BC0C-CE8EA2674A10}.Release|Any CPU.ActiveCfg = Release|Any CPU
38-
{7C24F7A4-D89C-4E48-BC0C-CE8EA2674A10}.Release|Any CPU.Build.0 = Release|Any CPU
3933
EndGlobalSection
4034
GlobalSection(SolutionProperties) = preSolution
4135
HideSolutionNode = FALSE

‎src/Our.Umbraco.DocTypeGridEditor/App_Plugins/DocTypeGridEditor/package.manifest

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎src/Our.Umbraco.DocTypeGridEditor/DocTypeGridEditorComposer.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
using Our.Umbraco.DocTypeGridEditor.Events;
1+
using Microsoft.Extensions.DependencyInjection;
2+
using Our.Umbraco.DocTypeGridEditor.Events;
23
using Our.Umbraco.DocTypeGridEditor.Helpers;
34
using Our.Umbraco.DocTypeGridEditor.ValueProcessing;
45
using Umbraco.Cms.Core.Composing;
56
using Umbraco.Cms.Core.DependencyInjection;
67
using Umbraco.Cms.Core.Notifications;
7-
using Umbraco.Extensions;
88

99
namespace Our.Umbraco.DocTypeGridEditor
1010
{
1111
public class DocTypeGridEditorComposer : IComposer
1212
{
1313
public void Compose(IUmbracoBuilder builder)
1414
{
15+
builder.ManifestFilters().Append<DocTypeGridEditorManifestFilter>();
1516
builder.DocTypeGridEditorValueProcessors().Append<UmbracoTagsValueProcessor>();
1617
builder.DataValueReferenceFactories().Append<DocTypeGridEditorDataValueReference>();
17-
builder.Services.AddUnique<DocTypeGridEditorHelper>();
18+
builder.Services.AddSingleton<DocTypeGridEditorHelper>();
1819

1920
// Add Event handlers
2021
builder.AddNotificationHandler<DataTypeCacheRefresherNotification, DataTypeCacheRefreshHandler>();

‎src/Our.Umbraco.DocTypeGridEditor/DocTypeGridEditorManifestFilter.cs

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using Umbraco.Cms.Core.Manifest;
4+
using Umbraco.Cms.Core.PropertyEditors;
5+
6+
namespace Our.Umbraco.DocTypeGridEditor
7+
{
8+
public class DocTypeGridEditorManifestFilter : IManifestFilter
9+
{
10+
public void Filter(List<PackageManifest> manifests)
11+
{
12+
manifests.Add(new PackageManifest()
13+
{
14+
AllowPackageTelemetry = true,
15+
PackageName = "Doc Type Grid Editor",
16+
GridEditors = new[]
17+
{
18+
new GridEditor()
19+
{
20+
Alias = "docType",
21+
Name = "Doc Type",
22+
View = "/App_Plugins/DocTypeGridEditor/Views/DocTypeGridEditor.html",
23+
Render = "/App_Plugins/DocTypeGridEditor/Render/DocTypeGridEditor.cshtml",
24+
Icon = "icon-science",
25+
Config = new Dictionary<string, object>()
26+
{
27+
{ "allowedDocTypes", Array.Empty<string>() },
28+
{ "nameTemplate", "" },
29+
{ "enablePreview", true },
30+
{ "viewPath", "/Views/Partials/grid/editors/DocTypeGridEditor/" },
31+
{ "previewViewPath", "/Views/Partials/grid/editors/DocTypeGridEditor/Previews/" },
32+
{ "previewCssFilePath", "" },
33+
{ "previewJsFilePath", "" }
34+
}
35+
}
36+
},
37+
Scripts = new[]
38+
{
39+
"/App_Plugins/DocTypeGridEditor/Js/doctypegrideditor.resources.js",
40+
"/App_Plugins/DocTypeGridEditor/Js/doctypegrideditor.services.js",
41+
"/App_Plugins/DocTypeGridEditor/Js/doctypegrideditor.controllers.js",
42+
"/App_Plugins/DocTypeGridEditor/Js/doctypegrideditor.directives.js"
43+
},
44+
Stylesheets = new[]
45+
{
46+
"/App_Plugins/DocTypeGridEditor/Css/doctypegrideditor.css"
47+
}
48+
49+
});
50+
}
51+
}
52+
}

‎src/Our.Umbraco.DocTypeGridEditor/Models/UnpublishedContent.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
64
using Umbraco.Cms.Core.Models;
75
using Umbraco.Cms.Core.Models.PublishedContent;
86
using Umbraco.Cms.Core.PropertyEditors;

‎src/Our.Umbraco.DocTypeGridEditor/Our.Umbraco.DocTypeGridEditor.csproj

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,25 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk.Razor">
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<ContentTargetFolders>.</ContentTargetFolders>
5+
<StaticWebAssetBasePath>App_Plugins/DocTypeGridEditor</StaticWebAssetBasePath>
6+
57
<PackageId>Our.Umbraco.DocTypeGridEditor</PackageId>
68
<Title>Our.Umbraco.DocTypeGridEditor</Title>
79
<Description></Description>
810
<Product>Our.Umbraco.DocTypeGridEditor</Product>
911
<PackageTags>umbraco plugin package</PackageTags>
10-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
11-
<Version>9.0.2</Version>
12+
13+
<Version>10.0.0</Version>
1214
<Authors>Søren Kottal</Authors>
1315
<Company></Company>
16+
1417
<AssemblyName>Our.Umbraco.DocTypeGridEditor</AssemblyName>
1518
<RootNamespace>Our.Umbraco.DocTypeGridEditor</RootNamespace>
1619
</PropertyGroup>
1720

1821
<ItemGroup>
19-
<PackageReference Include="Umbraco.Cms.Web.Website" Version="9.0.0" />
20-
<PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="9.0.0" />
21-
</ItemGroup>
22-
23-
<ItemGroup>
24-
<Content Include="App_Plugins\DocTypeGridEditor\**\*.*">
25-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
26-
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
27-
</Content>
28-
<None Include="build\**\*.*">
29-
<Pack>True</Pack>
30-
<PackagePath>build</PackagePath>
31-
</None>
22+
<PackageReference Include="Umbraco.Cms.Web.Website" Version="10.0.0" />
23+
<PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="10.0.0" />
3224
</ItemGroup>
3325
</Project>

‎src/Our.Umbraco.DocTypeGridEditor/Our.Umbraco.DocTypeGridEditor9.sln

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)