Skip to content

Commit 9617ec7

Browse files
Update dependencies (13.0.0-rc2)
1 parent fe4880d commit 9617ec7

File tree

5 files changed

+1202
-1354
lines changed

5 files changed

+1202
-1354
lines changed

Directory.Build.props

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<WarningsAsErrors>Nullable</WarningsAsErrors>
1717
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1818
<AnalysisMode>All</AnalysisMode>
19+
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
1920
</PropertyGroup>
2021

2122
<!-- NuGet packages lock -->
@@ -28,15 +29,14 @@
2829
<!-- SourceLink -->
2930
<PropertyGroup>
3031
<PublishRepositoryUrl>true</PublishRepositoryUrl>
31-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
3232
<IncludeSymbols>true</IncludeSymbols>
3333
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
3434
</PropertyGroup>
3535

3636
<!-- Package Validation -->
3737
<PropertyGroup>
3838
<GenerateCompatibilitySuppressionFile>false</GenerateCompatibilitySuppressionFile>
39-
<EnablePackageValidation>false</EnablePackageValidation>
39+
<!--<EnablePackageValidation>true</EnablePackageValidation>-->
4040
<PackageValidationBaselineVersion>13.0.0</PackageValidationBaselineVersion>
4141
<EnableStrictModeForCompatibleFrameworksInPackage>true</EnableStrictModeForCompatibleFrameworksInPackage>
4242
<EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>
@@ -53,13 +53,9 @@
5353
<!-- Use version range on project references (to limit on major version in generated packages) -->
5454
<Target Name="_GetProjectReferenceVersionRanges" AfterTargets="_GetProjectReferenceVersions">
5555
<ItemGroup>
56-
<_ProjectReferencesWithVersionRanges Include="@(_ProjectReferencesWithVersions)">
57-
<ProjectVersion Condition="'%(_ProjectReferencesWithVersions.ProjectVersion)' != ''">[%(_ProjectReferencesWithVersions.ProjectVersion), $([MSBuild]::Add($([System.Text.RegularExpressions.Regex]::Match('%(_ProjectReferencesWithVersions.ProjectVersion)', '^\d+').Value), 1)))</ProjectVersion>
58-
</_ProjectReferencesWithVersionRanges>
59-
</ItemGroup>
60-
<ItemGroup>
61-
<_ProjectReferencesWithVersions Remove="@(_ProjectReferencesWithVersions)" />
62-
<_ProjectReferencesWithVersions Include="@(_ProjectReferencesWithVersionRanges)" />
56+
<_ProjectReferencesWithVersions Condition="'%(ProjectVersion)' != ''">
57+
<ProjectVersion>[%(ProjectVersion), $([MSBuild]::Add($([System.Text.RegularExpressions.Regex]::Match('%(ProjectVersion)', '^\d+').Value), 1)))</ProjectVersion>
58+
</_ProjectReferencesWithVersions>
6359
</ItemGroup>
6460
</Target>
6561
</Project>

Directory.Packages.props

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,16 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55
<ItemGroup>
6-
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
76
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" />
87
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507" />
9-
<GlobalPackageReference Include="Umbraco.Code" Version="2.0.0" />
8+
<GlobalPackageReference Include="Umbraco.Code" Version="2.1.0" />
109
<GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
1110
</ItemGroup>
1211
<PropertyGroup>
13-
<UmbracoCmsPackageVersion>[13.0.0-rc1, 14)</UmbracoCmsPackageVersion>
12+
<UmbracoStorageProvidersPackageVersion>[13.0.0-rc2, 14)</UmbracoStorageProvidersPackageVersion>
1413
</PropertyGroup>
1514
<ItemGroup>
16-
<PackageVersion Include="Umbraco.StorageProviders.AzureBlob" Version="$(UmbracoCmsPackageVersion)" />
17-
<PackageVersion Include="Umbraco.StorageProviders.AzureBlob.ImageSharp" Version="$(UmbracoCmsPackageVersion)" />
15+
<PackageVersion Include="Umbraco.StorageProviders.AzureBlob" Version="$(UmbracoStorageProvidersPackageVersion)" />
16+
<PackageVersion Include="Umbraco.StorageProviders.AzureBlob.ImageSharp" Version="$(UmbracoStorageProvidersPackageVersion)" />
1817
</ItemGroup>
1918
</Project>

0 commit comments

Comments
 (0)