Merge branch 'develop' into main

AaronSadlerUK · Feb 28, 2022 · 4bd2c53 · 4bd2c53
2 parents e5d209f + 386a250
commit 4bd2c53
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/azure-pipelines-rc-stable.yml b/azure-pipelines-rc-stable.yml
@@ -5,7 +5,7 @@ variables:
  src/UmbNav.Api/UmbNav.Api.csproj
 
  src/UmbNav.Core/UmbNav.Core.csproj
-name: 1.0$(Rev:.r)
+name: 1.1$(Rev:.r)
 resources:
  repositories:
  - repository: self

diff --git a/src/UmbNav.Api/UmbNav.Api.csproj b/src/UmbNav.Api/UmbNav.Api.csproj
@@ -31,6 +31,11 @@
  <PackageReference Include="Umbraco.Cms.Web.BackOffice" version="9.0.0" />
  </ItemGroup>
 
+ <ItemGroup Condition="'$(TargetFramework)' == 'net60'">
+ <PackageReference Include="Umbraco.Cms.Web.Website" version="9.0.0" />
+ <PackageReference Include="Umbraco.Cms.Web.BackOffice" version="9.0.0" />
+ </ItemGroup>
+
  <ItemGroup>
  <ProjectReference Include="..\UmbNav.Core\UmbNav.Core.csproj" />
  </ItemGroup>

diff --git a/src/UmbNav.Core/UmbNav.Core.csproj b/src/UmbNav.Core/UmbNav.Core.csproj
@@ -32,6 +32,11 @@
  <PackageReference Include="Umbraco.Cms.Web.BackOffice" version="9.0.0" />
  </ItemGroup>
 
+ <ItemGroup Condition="'$(TargetFramework)' == 'net60'">
+ <PackageReference Include="Umbraco.Cms.Web.Website" version="9.0.0" />
+ <PackageReference Include="Umbraco.Cms.Web.BackOffice" version="9.0.0" />
+ </ItemGroup>
+
  <ItemGroup>
  <None Include="..\UmbNav-Logo.png">
  <Pack>True</Pack>

diff --git a/src/UmbNav.Web/UmbNav.Web.csproj b/src/UmbNav.Web/UmbNav.Web.csproj
@@ -31,6 +31,11 @@
  <PackageReference Include="Umbraco.Cms.Web.BackOffice" version="9.0.0" />
  </ItemGroup>
 
+ <ItemGroup Condition="'$(TargetFramework)' == 'net50'">
+ <PackageReference Include="Umbraco.Cms.Web.Website" version="9.0.0" />
+ <PackageReference Include="Umbraco.Cms.Web.BackOffice" version="9.0.0" />
+ </ItemGroup>
+
  <ItemGroup>
  <Content Include="App_Plugins\UmbNav\**\*.*">
  <ExcludeFromSingleFile>true</ExcludeFromSingleFile>