yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix pack issue

Browse Source
This commit is contained in:
Bjarke Berg
2022-10-05 16:04:26 +02:00
parent b797350d00
commit 44e768de4d
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Cms.Targets/Umbraco.Cms.Targets.csproj
View File

@@ -31,10 +31,11 @@
<Target Name="JsonSchemaBuild">
<Exec WorkingDirectory="$(JsonSchemaProjectPath)" Command="dotnet run -c Release --mainOutputFile &quot;../Umbraco.Cms.Targets/appsettings-schema.json&quot; --cmsOutputFile &quot;../Umbraco.Cms.Targets/appsettings-schema.umbraco.json&quot;" />
</Target>
<!-- Generate appsettings.json schema on build (and before copying to project) -->
<PropertyGroup>
<JsonSchemaPath>$(MSBuildThisFileDirectory)appsettings-schema.json</JsonSchemaPath>
<JsonSchemaCmsPath>$(MSBuildThisFileDirectory)appsettings-schema.umbraco.json</JsonSchemaCmsPath>
<JsonSchemaProjectPath>$(MSBuildThisFileDirectory)..\JsonSchema\</JsonSchemaProjectPath>
</PropertyGroup>
<Target Name="GenerateAppsettingsSchema" BeforeTargets="Build;CopyAppsettingsSchema">

16
src/Umbraco.Cms/Umbraco.Cms.csproj
View File

@@ -5,7 +5,7 @@
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeSymbols>false</IncludeSymbols>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Umbraco.Cms.Targets\Umbraco.Cms.Targets.csproj" />
<ProjectReference Include="..\Umbraco.Cms.Imaging.ImageSharp\Umbraco.Cms.Imaging.ImageSharp.csproj" />
@@ -19,18 +19,4 @@
<ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
<ProjectReference Include="..\Umbraco.Cms.ManagementApi\Umbraco.Cms.ManagementApi.csproj" />
</ItemGroup>
<ItemGroup>
<Content Include="buildTransitive\**" PackagePath="buildTransitive" />
<Content Include="$(JsonSchemaPath)" PackagePath="." />
</ItemGroup>
<!-- Generate appsettings.json schema on build (and before copying to project) -->
<PropertyGroup>
<JsonSchemaPath>$(MSBuildThisFileDirectory)appsettings-schema.json</JsonSchemaPath>
<JsonSchemaProjectPath>$(MSBuildThisFileDirectory)..\JsonSchema\</JsonSchemaProjectPath>
</PropertyGroup>
<Target Name="GenerateAppsettingsSchema" BeforeTargets="Build" Condition="!Exists('$(JsonSchemaPath)')">
<Message Text="Generating appsettings-schema.json because it doesn't exist" Importance="high" />
<Exec WorkingDirectory="$(JsonSchemaProjectPath)" Command="dotnet run -c Release -o &quot;$(JsonSchemaPath)&quot;" />
</Target>
</Project>