Skip to content

Commit 83d1278

Browse files
Merge branch 'v12/dev' into v13/dev
2 parents 38c4481 + 0b03e30 commit 83d1278

File tree

61 files changed

+6739
-2045
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+6739
-2045
lines changed

.editorconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ dotnet_style_prefer_simplified_interpolation = true:warning
144144
# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#implicit-and-explicit-types
145145
csharp_style_var_for_built_in_types = never
146146
csharp_style_var_when_type_is_apparent = true:warning
147-
csharp_style_var_elsewhere = false:warning
147+
csharp_style_var_elsewhere = true:warning
148148
# Expression-bodied members
149149
# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#expression-bodied-members
150150
csharp_style_expression_bodied_methods = true:suggestion
@@ -248,6 +248,7 @@ csharp_preserve_single_line_blocks = true
248248
##########################################
249249

250250
[*.{cs,csx,cake,vb,vbx}]
251+
dotnet_diagnostic.CS1591.severity = suggestion
251252

252253
##########################################
253254
# Styles

.gitattributes

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,56 @@
11
* text=auto
2+
*.doc diff=astextplain
3+
*.DOC diff=astextplain
4+
*.docx diff=astextplain
5+
*.DOCX diff=astextplain
6+
*.dot diff=astextplain
7+
*.DOT diff=astextplain
8+
*.pdf diff=astextplain
9+
*.PDF diff=astextplain
10+
*.rtf diff=astextplain
11+
*.RTF diff=astextplain
12+
13+
*.jpg binary
14+
*.png binary
15+
*.gif binary
16+
17+
*.cs text=auto diff=csharp
18+
*.vb text=auto
19+
*.c text=auto
20+
*.cpp text=auto
21+
*.cxx text=auto
22+
*.h text=auto
23+
*.hxx text=auto
24+
*.py text=auto
25+
*.rb text=auto
26+
*.java text=auto
27+
*.html text=auto
28+
*.htm text=auto
29+
*.css text=auto
30+
*.scss text=auto
31+
*.sass text=auto
32+
*.less text=auto
33+
*.js text=auto
34+
*.lisp text=auto
35+
*.clj text=auto
36+
*.sql text=auto
37+
*.php text=auto
38+
*.lua text=auto
39+
*.m text=auto
40+
*.asm text=auto
41+
*.erl text=auto
42+
*.fs text=auto
43+
*.fsx text=auto
44+
*.hs text=auto
45+
*.json text=auto
46+
*.xml text=auto
47+
*.resx text=auto
48+
*.yml text eol=lf core.whitespace whitespace=tab-in-indent,trailing-space,tabwidth=2
49+
50+
*.csproj text=auto merge=union
51+
*.vbproj text=auto merge=union
52+
*.fsproj text=auto merge=union
53+
*.dbproj text=auto merge=union
54+
*.sln text=auto eol=crlf merge=union
55+
56+
*.gitattributes text=auto

.gitignore

Lines changed: 44 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
## Ignore Visual Studio temporary files, build results, and
22
## files generated by popular Visual Studio add-ons.
33
##
4-
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
4+
## Get latest from `dotnet new gitignore`
5+
6+
# dotenv files
7+
.env
58

69
# User-specific files
710
*.rsuser
@@ -57,7 +60,7 @@ dlldata.c
5760
# Benchmark Results
5861
BenchmarkDotNet.Artifacts/
5962

60-
# .NET Core
63+
# .NET
6164
project.lock.json
6265
project.fragment.lock.json
6366
artifacts/
@@ -93,6 +96,7 @@ StyleCopReport.xml
9396
*.tmp_proj
9497
*_wpftmp.csproj
9598
*.log
99+
*.tlog
96100
*.vspscc
97101
*.vssscc
98102
.builds
@@ -296,6 +300,17 @@ node_modules/
296300
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
297301
*.vbw
298302

303+
# Visual Studio 6 auto-generated project file (contains which files were open etc.)
304+
*.vbp
305+
306+
# Visual Studio 6 workspace and project file (working project files containing files to include in project)
307+
*.dsw
308+
*.dsp
309+
310+
# Visual Studio 6 technical files
311+
*.ncb
312+
*.aps
313+
299314
# Visual Studio LightSwitch build output
300315
**/*.HTMLClient/GeneratedArtifacts
301316
**/*.DesktopClient/GeneratedArtifacts
@@ -352,6 +367,9 @@ ASALocalRun/
352367
# Local History for Visual Studio
353368
.localhistory/
354369

370+
# Visual Studio History (VSHistory) files
371+
.vshistory/
372+
355373
# BeatPulse healthcheck temp database
356374
healthchecksdb
357375

@@ -364,6 +382,28 @@ MigrationBackup/
364382
# Fody - auto-generated XML schema
365383
FodyWeavers.xsd
366384

385+
# VS Code files for those working on multiple tools
386+
.vscode/*
387+
!.vscode/settings.json
388+
!.vscode/tasks.json
389+
!.vscode/launch.json
390+
!.vscode/extensions.json
391+
*.code-workspace
392+
393+
# Local History for Visual Studio Code
394+
.history/
395+
396+
# Windows Installer files from build outputs
397+
*.cab
398+
*.msi
399+
*.msix
400+
*.msm
401+
*.msp
402+
403+
# JetBrains Rider
404+
*.sln.iml
405+
.idea
406+
367407
##
368408
## Visual studio for Mac
369409
##
@@ -440,18 +480,5 @@ $RECYCLE.BIN/
440480
# Windows shortcuts
441481
*.lnk
442482

443-
# JetBrains Rider
444-
.idea/
445-
*.sln.iml
446-
447-
# Git
448-
*.orig
449-
450-
##
451-
## Visual Studio Code
452-
##
453-
.vscode/*
454-
!.vscode/settings.json
455-
!.vscode/tasks.json
456-
!.vscode/launch.json
457-
!.vscode/extensions.json
483+
# Vim temporary swap files
484+
*.swp

.globalconfig

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,9 @@ dotnet_analyzer_diagnostic.category-StyleCop.CSharp.OrderingRules.severity = sug
4848
dotnet_analyzer_diagnostic.category-StyleCop.CSharp.MaintainabilityRules.severity = suggestion
4949
dotnet_analyzer_diagnostic.category-StyleCop.CSharp.LayoutRules.severity = suggestion
5050

51+
dotnet_diagnostic.SA1636.severity = none # SA1636: File header copyright text should match
5152
dotnet_diagnostic.SA1101.severity = none # PrefixLocalCallsWithThis - stylecop appears to be ignoring dotnet_style_qualification_for_*
5253
dotnet_diagnostic.SA1309.severity = none # FieldNamesMustNotBeginWithUnderscore
53-
dotnet_diagnostic.SA1413.severity = none # UseTrailingCommasInMultiLineInitializers
54-
dotnet_diagnostic.SA1633.severity = none # FileMustHaveHeader
55-
dotnet_diagnostic.SA1636.severity = none # FileHeaderCopyrightTextMustMatch
5654

5755
dotnet_diagnostic.SA1503.severity = warning # BracesMustNotBeOmitted
5856
dotnet_diagnostic.SA1117.severity = warning # ParametersMustBeOnSameLineOrSeparateLines
@@ -82,7 +80,4 @@ dotnet_diagnostic.SA1306.severity = warning # FieldNamesMustBeginWithLowerCaseLe
8280
dotnet_diagnostic.SA1209.severity = warning # UsingAliasDirectivesMustBePlacedAfterOtherUsingDirectives
8381
dotnet_diagnostic.SA1216.severity = warning # UsingStaticDirectivesMustBePlacedAtTheCorrectLocation
8482
dotnet_diagnostic.SA1133.severity = warning # DoNotCombineAttributes
85-
dotnet_diagnostic.SA1135.severity = warning # UsingDirectivesMustBeQualified
86-
87-
# IDE0058: Expression value is never used
88-
dotnet_diagnostic.IDE0058.severity = none
83+
dotnet_diagnostic.SA1135.severity = warning # UsingDirectivesMustBeQualified

Directory.Build.props

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,61 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<Project>
23
<PropertyGroup>
34
<TargetFramework>net8.0</TargetFramework>
45
<Company>Umbraco HQ</Company>
56
<Authors>Umbraco</Authors>
67
<Copyright>Copyright © Umbraco $([System.DateTime]::Today.ToString('yyyy'))</Copyright>
78
<Product>Umbraco Deploy Contrib</Product>
8-
<PackageProjectUrl>https://umbraco.com/</PackageProjectUrl>
9+
<PackageProjectUrl>https://github.com/umbraco/Umbraco.Deploy.Contrib</PackageProjectUrl>
910
<PackageIconUrl>https://umbraco.com/dist/nuget/logo-small.png</PackageIconUrl>
1011
<PackageIcon>icon.png</PackageIcon>
1112
<PackageLicenseExpression>MIT</PackageLicenseExpression>
12-
<PackageTags>umbraco</PackageTags>
13+
<PackageTags>umbraco deploy contrib</PackageTags>
1314
<NeutralLanguage>en-US</NeutralLanguage>
1415
<Nullable>enable</Nullable>
1516
<GenerateDocumentationFile>true</GenerateDocumentationFile>
17+
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
1618
</PropertyGroup>
1719

18-
<ItemGroup>
19-
<Content Include="$(MSBuildThisFileDirectory)icon.png" Pack="true" PackagePath="" Visible="false" />
20-
</ItemGroup>
21-
20+
<!-- NuGet packages lock -->
21+
<PropertyGroup>
22+
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
23+
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
24+
<DefaultItemExcludes>$(DefaultItemExcludes);packages.lock.json</DefaultItemExcludes>
25+
</PropertyGroup>
26+
2227
<!-- SourceLink -->
2328
<PropertyGroup>
2429
<PublishRepositoryUrl>true</PublishRepositoryUrl>
25-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2630
<IncludeSymbols>true</IncludeSymbols>
2731
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2832
</PropertyGroup>
29-
33+
3034
<!-- Package Validation -->
3135
<PropertyGroup>
3236
<GenerateCompatibilitySuppressionFile>false</GenerateCompatibilitySuppressionFile>
33-
<!-- TODO (V13): When 13.0.0 is released, update the below to true. -->
34-
<EnablePackageValidation>false</EnablePackageValidation>
37+
<EnablePackageValidation>true</EnablePackageValidation>
3538
<PackageValidationBaselineVersion>13.0.0</PackageValidationBaselineVersion>
3639
<EnableStrictModeForCompatibleFrameworksInPackage>true</EnableStrictModeForCompatibleFrameworksInPackage>
3740
<EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>
3841
</PropertyGroup>
39-
40-
<!-- GitVersioning -->
42+
43+
<!-- Calculate version only once for the whole repository -->
4144
<PropertyGroup>
4245
<GitVersionBaseDirectory>$(MSBuildThisFileDirectory)</GitVersionBaseDirectory>
4346
</PropertyGroup>
47+
48+
<!-- Include icon in generated NuGet packages -->
49+
<ItemGroup>
50+
<Content Include="$(MSBuildThisFileDirectory)icon.png" Pack="true" PackagePath="" Visible="false" />
51+
</ItemGroup>
52+
53+
<!-- Use version range on project references (to limit on major version in generated packages) -->
54+
<Target Name="_GetProjectReferenceVersionRanges" AfterTargets="_GetProjectReferenceVersions">
55+
<ItemGroup>
56+
<_ProjectReferencesWithVersions Condition="'%(ProjectVersion)' != ''">
57+
<ProjectVersion>[%(ProjectVersion), $([MSBuild]::Add($([System.Text.RegularExpressions.Regex]::Match('%(ProjectVersion)', '^\d+').Value), 1)))</ProjectVersion>
58+
</_ProjectReferencesWithVersions>
59+
</ItemGroup>
60+
</Target>
4461
</Project>

Directory.Packages.props

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<Project>
23
<PropertyGroup>
34
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
45
</PropertyGroup>
6+
<!-- Global packages (private, build-time packages for all projects) -->
57
<ItemGroup>
68
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" />
79
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507" />
810
<GlobalPackageReference Include="Umbraco.Code" Version="2.1.0" />
911
<GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
1012
</ItemGroup>
13+
<!-- Umbraco packages -->
1114
<ItemGroup>
12-
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
13-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
14-
<PackageVersion Include="Umbraco.Cms.Tests" Version="[13.0.0, 14)" />
15-
<PackageVersion Include="Umbraco.Deploy.Infrastructure" Version="[13.0.0, 14)" />
15+
<PackageVersion Include="Umbraco.Cms.Web.Common" Version="[13.0.0, 14)" />
16+
<PackageVersion Include="Umbraco.Deploy.Infrastructure" Version="[13.1.0-rc1, 14)" />
1617
</ItemGroup>
1718
</Project>

LICENSE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
The MIT License (MIT)
22

33
Copyright &copy; 2016 Umbraco
4+
45
Copyright &copy; 2016 Our Umbraco and other contributors
6+
57
Copyright &copy; 2014 Lee Kelleher, Umbrella Inc
68

79
Permission is hereby granted, free of charge, to any person obtaining a copy of

NuGet.config

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

Umbraco.Deploy.Contrib.sln

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

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
4-
VisualStudioVersion = 17.3.32819.101
4+
VisualStudioVersion = 17.8.34330.188
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Deploy.Contrib", "src\Umbraco.Deploy.Contrib\Umbraco.Deploy.Contrib.csproj", "{42FB2213-0815-41CD-94F8-DFB0EC1D8061}"
77
EndProject
@@ -19,12 +19,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1919
global.json = global.json
2020
icon.png = icon.png
2121
LICENSE.md = LICENSE.md
22-
NuGet.config = NuGet.config
22+
nuget.config = nuget.config
2323
README.md = README.md
2424
version.json = version.json
2525
EndProjectSection
2626
EndProject
27-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{A6A24D3F-71EC-4B77-8466-6CCBB69DC2A2}"
27+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{71D68BC9-0940-4644-8342-4806401B4ACD}"
28+
ProjectSection(SolutionItems) = preProject
29+
tests\.editorconfig = tests\.editorconfig
30+
tests\codeanalysis.ruleset = tests\codeanalysis.ruleset
31+
tests\Directory.Build.props = tests\Directory.Build.props
32+
tests\Directory.Packages.props = tests\Directory.Packages.props
33+
EndProjectSection
2834
EndProject
2935
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Deploy.Contrib.Tests", "tests\Umbraco.Deploy.Contrib.Tests\Umbraco.Deploy.Contrib.Tests.csproj", "{D359D4DA-6B00-49C1-974F-CF3058A3F5D9}"
3036
EndProject
@@ -47,7 +53,7 @@ Global
4753
HideSolutionNode = FALSE
4854
EndGlobalSection
4955
GlobalSection(NestedProjects) = preSolution
50-
{D359D4DA-6B00-49C1-974F-CF3058A3F5D9} = {A6A24D3F-71EC-4B77-8466-6CCBB69DC2A2}
56+
{D359D4DA-6B00-49C1-974F-CF3058A3F5D9} = {71D68BC9-0940-4644-8342-4806401B4ACD}
5157
EndGlobalSection
5258
GlobalSection(ExtensibilityGlobals) = postSolution
5359
SolutionGuid = {20357E31-FA18-4D77-B38B-6C878A179849}

0 commit comments

Comments
 (0)