-
Notifications
You must be signed in to change notification settings - Fork 2.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update/replace legacy dotnet new umbraco-package template with RCL
#15258
Closed
ronaldbarendse
wants to merge
21
commits into
v14/dev
from
feature/remove-legacy-umbracopackage-template
Closed
Changes from 4 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
45d3f16
Replace legacy package template with RCL
ronaldbarendse 9637416
Align framework parameter casing with .NET default templates and remo…
ronaldbarendse f4c1e29
Update Microsoft.ICU.ICU4C.Runtime to 72.1.0.3
ronaldbarendse 65ab158
Merge branch 'release/13.0' into feature/remove-legacy-umbracopackage…
ronaldbarendse 92a8640
Fixed filter queries for numeric and date based filters (#15286)
kjac 88f9079
Cache block item constructors for block based editors (#15264)
kjac a8dc058
V13: Delivery API composite id handler (#15305)
Zeegaan b596900
Log meaningful job names and use template based log messages (#15307)
kjac d088ed8
V13: Webhook all the things (#15161)
warrenbuckley c0e0e7b
Add HealthCheckCompletedNotification (#15276)
erikjanwestendorp e7f7492
Configure Angular cookie using defaults from antiforgery options and …
ronaldbarendse feaac58
localization for webhooks (#15191)
erikjanwestendorp 212b566
Add webhook labels to FR file (#15183)
mikecp ecc31a3
Added BlockEditorDataConverter method to BlockListPropertyEditorBase …
FullStackChef 71a3452
Added [NotNullWhen(true)] attribute to IPublishedSnapshotAccessor and…
abjerner 8f497c8
V13 RC: Fix regression for external login providers (#15334)
iOvergaard 50baed1
Use version range on project references (#14719)
ronaldbarendse a4b4107
Expose the Delivery API CLR type (#15150)
vsilvar 55c901e
Merge branch 'v13/dev' into release/13.0
kjac 12a43c2
v13: Update deploy types (add setter to `ArtifactDependency.Checksum`…
ronaldbarendse 212a143
Merge branch 'release/13.0' into feature/remove-legacy-umbracopackage…
ronaldbarendse File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| # Do not inherit customized EditorConfig for template content | ||
| root = true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| <Project> | ||
| <!-- Enable multi-level merging with src --> | ||
| <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)..\src\'))" /> | ||
| <!-- Enable multi-level merging with src --> | ||
| <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)..\src\'))" /> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,66 +1,65 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <Title>Umbraco CMS - Templates</Title> | ||
| <Description>Contains templates for Umbraco CMS, as well as the templates for creating new packages for the Umbraco CMS.</Description> | ||
| <PackageType>Template</PackageType> | ||
| <IncludeBuildOutput>false</IncludeBuildOutput> | ||
| <IncludeSymbols>false</IncludeSymbols> | ||
| <NoDefaultExcludes>true</NoDefaultExcludes> | ||
| <IncludeContentInPack>true</IncludeContentInPack> | ||
| <ContentTargetFolders>.</ContentTargetFolders> | ||
| <NoWarn>NU5128</NoWarn> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <Title>Umbraco CMS - Templates</Title> | ||
| <Description>Contains templates for Umbraco CMS, as well as the templates for creating new packages for the Umbraco CMS.</Description> | ||
| <PackageType>Template</PackageType> | ||
| <IncludeBuildOutput>false</IncludeBuildOutput> | ||
| <IncludeSymbols>false</IncludeSymbols> | ||
| <NoDefaultExcludes>true</NoDefaultExcludes> | ||
| <IncludeContentInPack>true</IncludeContentInPack> | ||
| <ContentTargetFolders>.</ContentTargetFolders> | ||
| <NoWarn>NU5128</NoWarn> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Content Include="UmbracoPackage\**" Exclude="bin;obj" /> | ||
| <Content Include="UmbracoPackageRcl\**" Exclude="bin;obj" /> | ||
| <Content Include="UmbracoProject\**" Exclude="bin;obj" /> | ||
| <Content Include="..\src\Umbraco.Web.UI\Program.cs"> | ||
| <Link>UmbracoProject\Program.cs</Link> | ||
| <PackagePath>UmbracoProject</PackagePath> | ||
| </Content> | ||
| <Content Include="..\src\Umbraco.Web.UI\Views\Partials\blocklist\**"> | ||
| <Link>UmbracoProject\Views\Partials\blocklist\%(RecursiveDir)%(Filename)%(Extension)</Link> | ||
| <PackagePath>UmbracoProject\Views\Partials\blocklist</PackagePath> | ||
| </Content> | ||
| <Content Include="..\src\Umbraco.Web.UI\Views\Partials\grid\**"> | ||
| <Link>UmbracoProject\Views\Partials\grid\%(RecursiveDir)%(Filename)%(Extension)</Link> | ||
| <PackagePath>UmbracoProject\Views\Partials\grid</PackagePath> | ||
| </Content> | ||
| <Content Include="..\src\Umbraco.Web.UI\Views\Partials\blockgrid\**"> | ||
| <Link>UmbracoProject\Views\Partials\blockgrid\%(RecursiveDir)%(Filename)%(Extension)</Link> | ||
| <PackagePath>UmbracoProject\Views\Partials\blockgrid</PackagePath> | ||
| </Content> | ||
| <Content Include="..\src\Umbraco.Web.UI\Views\_ViewImports.cshtml"> | ||
| <Link>UmbracoProject\Views\_ViewImports.cshtml</Link> | ||
| <PackagePath>UmbracoProject\Views</PackagePath> | ||
| </Content> | ||
| <Content Include="..\src\Umbraco.Web.UI\wwwroot\favicon.ico"> | ||
| <Link>UmbracoProject\wwwroot\favicon.ico</Link> | ||
| <PackagePath>UmbracoProject\wwwroot</PackagePath> | ||
| </Content> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Content Include="UmbracoPackage\**" Exclude="bin;obj" /> | ||
| <Content Include="UmbracoProject\**" Exclude="bin;obj" /> | ||
| <Content Include="..\src\Umbraco.Web.UI\Program.cs"> | ||
| <Link>UmbracoProject\Program.cs</Link> | ||
| <PackagePath>UmbracoProject</PackagePath> | ||
| </Content> | ||
| <Content Include="..\src\Umbraco.Web.UI\Views\Partials\blocklist\**"> | ||
| <Link>UmbracoProject\Views\Partials\blocklist\%(RecursiveDir)%(Filename)%(Extension)</Link> | ||
| <PackagePath>UmbracoProject\Views\Partials\blocklist</PackagePath> | ||
| </Content> | ||
| <Content Include="..\src\Umbraco.Web.UI\Views\Partials\grid\**"> | ||
| <Link>UmbracoProject\Views\Partials\grid\%(RecursiveDir)%(Filename)%(Extension)</Link> | ||
| <PackagePath>UmbracoProject\Views\Partials\grid</PackagePath> | ||
| </Content> | ||
| <Content Include="..\src\Umbraco.Web.UI\Views\Partials\blockgrid\**"> | ||
| <Link>UmbracoProject\Views\Partials\blockgrid\%(RecursiveDir)%(Filename)%(Extension)</Link> | ||
| <PackagePath>UmbracoProject\Views\Partials\blockgrid</PackagePath> | ||
| </Content> | ||
| <Content Include="..\src\Umbraco.Web.UI\Views\_ViewImports.cshtml"> | ||
| <Link>UmbracoProject\Views\_ViewImports.cshtml</Link> | ||
| <PackagePath>UmbracoProject\Views</PackagePath> | ||
| </Content> | ||
| <Content Include="..\src\Umbraco.Web.UI\wwwroot\favicon.ico"> | ||
| <Link>UmbracoProject\wwwroot\favicon.ico</Link> | ||
| <PackagePath>UmbracoProject\wwwroot</PackagePath> | ||
| </Content> | ||
| </ItemGroup> | ||
|
|
||
| <!-- Update template.json files with the default UmbracoVersion value set to the current build version --> | ||
| <ItemGroup> | ||
| <PackageReference Include="Umbraco.JsonSchema.Extensions" Version="0.3.0" PrivateAssets="all" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Content Update="**\.template.config\template.json" Pack="false" /> | ||
| </ItemGroup> | ||
| <Target Name="GetUpdatedTemplateJsonPackageFiles" BeforeTargets="GenerateNuspec" AfterTargets="GetUmbracoBuildVersion"> | ||
| <ItemGroup> | ||
| <_TemplateJsonFiles Include="**\.template.config\template.json" Exclude="bin\**;obj\**" /> | ||
| <_TemplateJsonFiles> | ||
| <DestinationFile>$(IntermediateOutputPath)%(RelativeDir)%(Filename)%(Extension)</DestinationFile> | ||
| </_TemplateJsonFiles> | ||
| </ItemGroup> | ||
| <Copy SourceFiles="@(_TemplateJsonFiles)" DestinationFiles="%(DestinationFile)" /> | ||
| <JsonPathUpdateValue JsonFile="%(_TemplateJsonFiles.DestinationFile)" Path="$.symbols.UmbracoVersion.defaultValue" Value=""$(PackageVersion)"" /> | ||
| <ItemGroup> | ||
| <_PackageFiles Include="%(_TemplateJsonFiles.DestinationFile)"> | ||
| <PackagePath>%(_TemplateJsonFiles.RelativeDir)</PackagePath> | ||
| </_PackageFiles> | ||
| </ItemGroup> | ||
| </Target> | ||
| <!-- Update template.json files with the default UmbracoVersion value set to the current build version --> | ||
| <ItemGroup> | ||
| <PackageReference Include="Umbraco.JsonSchema.Extensions" Version="0.3.0" PrivateAssets="all" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Content Update="**\.template.config\template.json" Pack="false" /> | ||
| </ItemGroup> | ||
| <Target Name="GetUpdatedTemplateJsonPackageFiles" BeforeTargets="GenerateNuspec" AfterTargets="GetUmbracoBuildVersion"> | ||
| <ItemGroup> | ||
| <_TemplateJsonFiles Include="**\.template.config\template.json" Exclude="bin\**;obj\**" /> | ||
| <_TemplateJsonFiles> | ||
| <DestinationFile>$(IntermediateOutputPath)%(RelativeDir)%(Filename)%(Extension)</DestinationFile> | ||
| </_TemplateJsonFiles> | ||
| </ItemGroup> | ||
| <Copy SourceFiles="@(_TemplateJsonFiles)" DestinationFiles="%(DestinationFile)" /> | ||
| <JsonPathUpdateValue JsonFile="%(_TemplateJsonFiles.DestinationFile)" Path="$.symbols.UmbracoVersion.defaultValue" Value=""$(PackageVersion)"" /> | ||
| <ItemGroup> | ||
| <_PackageFiles Include="%(_TemplateJsonFiles.DestinationFile)"> | ||
| <PackagePath>%(_TemplateJsonFiles.RelativeDir)</PackagePath> | ||
| </_PackageFiles> | ||
| </ItemGroup> | ||
| </Target> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 0 additions & 5 deletions
5
templates/UmbracoPackage/App_Plugins/UmbracoPackage/package.manifest
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,27 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <TargetFramework>net8.0</TargetFramework> | ||
| <ContentTargetFolders>.</ContentTargetFolders> | ||
| <Product>UmbracoPackage</Product> | ||
| <PackageId>UmbracoPackage</PackageId> | ||
| <Title>UmbracoPackage</Title> | ||
| <Description>...</Description> | ||
| <PackageTags>umbraco plugin package</PackageTags> | ||
| <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">UmbracoPackage</RootNamespace> | ||
| </PropertyGroup> | ||
| <Project Sdk="Microsoft.NET.Sdk.Razor"> | ||
| <PropertyGroup> | ||
| <TargetFramework>net8.0</TargetFramework> | ||
| <Nullable>enable</Nullable> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <AddRazorSupportForMvc Condition="'$(SupportPagesAndViews)' == 'True'">true</AddRazorSupportForMvc> | ||
| <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">UmbracoPackage</RootNamespace> | ||
| <StaticWebAssetBasePath>App_Plugins/UmbracoPackage</StaticWebAssetBasePath> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Umbraco.Cms.Web.Website" Version="UMBRACO_VERSION_FROM_TEMPLATE" /> | ||
| <PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="UMBRACO_VERSION_FROM_TEMPLATE" /> | ||
| </ItemGroup> | ||
| <PropertyGroup> | ||
| <PackageId>UmbracoPackage</PackageId> | ||
| <Product>UmbracoPackage</Product> | ||
| <Title>UmbracoPackage</Title> | ||
| <Description>...</Description> | ||
| <PackageTags>umbraco plugin package</PackageTags> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Content Include="App_Plugins\UmbracoPackage\**" ExcludeFromSingleFile="true" CopyToPublishDirectory="Always" /> | ||
| <None Include="buildTransitive\**" Pack="true" PackagePath="buildTransitive" /> | ||
| </ItemGroup> | ||
| <ItemGroup Condition="'$(SupportPagesAndViews)' == 'True'"> | ||
| <FrameworkReference Include="Microsoft.AspNetCore.App" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Umbraco.Cms.Web.Website" Version="UMBRACO_VERSION_FROM_TEMPLATE" /> | ||
| <PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="UMBRACO_VERSION_FROM_TEMPLATE" /> | ||
| </ItemGroup> | ||
| </Project> |
21 changes: 0 additions & 21 deletions
21
templates/UmbracoPackage/buildTransitive/UmbracoPackage.targets
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "id": "UmbracoPackage", | ||
| "name": "UmbracoPackage", | ||
| "allowPackageTelemetry": true | ||
| } |
22 changes: 0 additions & 22 deletions
22
templates/UmbracoPackageRcl/.template.config/dotnetcli.host.json
This file was deleted.
Oops, something went wrong.
20 changes: 0 additions & 20 deletions
20
templates/UmbracoPackageRcl/.template.config/ide.host.json
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These changes have already been discussed in #13776 (comment) and we shouldn't keep pushing this change back (especially since we only allow a single framework version anyway)...