Skip to content

Commit

Permalink
Merge pull request #78 from RWS/feature/upgrade-dotnet4.8
Browse files Browse the repository at this point in the history
Updated DXA 2.3 framework release changes dependencies
  • Loading branch information
avmgan authored Mar 3, 2024
2 parents 699a2ba + f7fb779 commit 0b6ecdb
Show file tree
Hide file tree
Showing 30 changed files with 87 additions and 87 deletions.
8 changes: 4 additions & 4 deletions webapp-net/51Degrees/Sdl.Web.Modules.Degrees51.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@
<HintPath>..\packages\51Degrees.mobi.3.2.7.3\lib\NET40\FiftyOne.Foundation.dll</HintPath>
</Reference>
<Reference Include="Sdl.Web.Common">
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Common.dll</HintPath>
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Common.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Sdl.Web.Context.Api">
<HintPath>..\packages\Sdl.Web.Context.Client.11.0.0\lib\net462\Sdl.Web.Context.Api.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Sdl.Web.Mvc">
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Mvc.dll</HintPath>
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Mvc.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
Expand Down Expand Up @@ -76,12 +76,12 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net462\Sdl.Dxa.Framework.Web8.targets" Condition="Exists('..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net462\Sdl.Dxa.Framework.Web8.targets')" />
<Import Project="..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net48\Sdl.Dxa.Framework.Web8.targets" Condition="Exists('..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net48\Sdl.Dxa.Framework.Web8.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net462\Sdl.Dxa.Framework.Web8.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net462\Sdl.Dxa.Framework.Web8.targets')))" />
<Error Condition="!Exists('..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net48\Sdl.Dxa.Framework.Web8.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net48\Sdl.Dxa.Framework.Web8.targets')))" />
</Target>
<PropertyGroup>
<PostBuildEvent Condition="'$(TRAVIS)' == ''">REM Deploy build artifacts to DXA Site (on development machines with DXA_SITE_DIR environment variable set)
Expand Down
2 changes: 1 addition & 1 deletion webapp-net/51Degrees/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<package id="Microsoft.AspNet.Mvc" version="5.3.0" targetFramework="net452" />
<package id="51Degrees.mobi" version="3.2.7.3" targetFramework="net452" />
<package id="Microsoft.Web.Infrastructure" version="2.0.0.0" targetFramework="net452" />
<package id="Sdl.Dxa.Framework.Web8" version="2.2.12" targetFramework="net462" />
<package id="Sdl.Dxa.Framework.Web8" version="2.3.0" targetFramework="net48" />
<package id="Sdl.Web.Context.Client" version="11.0.0" targetFramework="net462" />
<package id="Sdl.Web.Delivery" version="11.0.0" targetFramework="net462" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
</Reference>
<Reference Include="Sdl.Web.Common">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Common.dll</HintPath>
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Common.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Sdl.Web.Mvc">
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Mvc.dll</HintPath>
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Mvc.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion webapp-net/AudienceManager/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<package id="Microsoft.AspNet.WebPages.Data" version="3.3.0" targetFramework="net452" />
<package id="Microsoft.AspNet.WebPages.WebData" version="3.3.0" targetFramework="net452" />
<package id="Sdl.AudienceManager.ContentDelivery" version="9.0.0" targetFramework="net462" />
<package id="Sdl.Dxa.Framework.Web8" version="2.2.12" targetFramework="net462" />
<package id="Sdl.Dxa.Framework.Web8" version="2.3.0" targetFramework="net48" />
<package id="Sdl.Web.Delivery" version="11.0.0" targetFramework="net462" />
</packages>
8 changes: 4 additions & 4 deletions webapp-net/AzureWebApp/Sdl.Web.Modules.AzureWebApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@
<Private>False</Private>
</Reference>
<Reference Include="Sdl.Web.Common">
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Common.dll</HintPath>
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Common.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Sdl.Web.Mvc">
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Mvc.dll</HintPath>
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Mvc.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
Expand Down Expand Up @@ -133,12 +133,12 @@
<Content Include="scripts\ai.0.22.17-build00153.min.js" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net462\Sdl.Dxa.Framework.Web8.targets" Condition="Exists('..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net462\Sdl.Dxa.Framework.Web8.targets')" />
<Import Project="..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net48\Sdl.Dxa.Framework.Web8.targets" Condition="Exists('..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net48\Sdl.Dxa.Framework.Web8.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net462\Sdl.Dxa.Framework.Web8.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net462\Sdl.Dxa.Framework.Web8.targets')))" />
<Error Condition="!Exists('..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net48\Sdl.Dxa.Framework.Web8.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net48\Sdl.Dxa.Framework.Web8.targets')))" />
<Error Condition="!Exists('..\packages\Microsoft.ApplicationInsights.DependencyCollector.2.9.0\build\Microsoft.ApplicationInsights.DependencyCollector.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.ApplicationInsights.DependencyCollector.2.9.0\build\Microsoft.ApplicationInsights.DependencyCollector.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.ApplicationInsights.PerfCounterCollector.2.9.0\build\Microsoft.ApplicationInsights.PerfCounterCollector.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.ApplicationInsights.PerfCounterCollector.2.9.0\build\Microsoft.ApplicationInsights.PerfCounterCollector.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.2.9.0\build\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.2.9.0\build\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.targets'))" />
Expand Down
2 changes: 1 addition & 1 deletion webapp-net/AzureWebApp/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<package id="Microsoft.AspNet.WebPages" version="3.3.0" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="2.0.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
<package id="Sdl.Dxa.Framework.Web8" version="2.2.12" targetFramework="net462" />
<package id="Sdl.Dxa.Framework.Web8" version="2.3.0" targetFramework="net48" />
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
<package id="System.Diagnostics.DiagnosticSource" version="5.0.0" targetFramework="net48" />
<package id="System.Memory" version="4.5.4" targetFramework="net48" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@
</Reference>
<Reference Include="Sdl.Web.DataModel">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Sdl.Dxa.DataModel.$(DxaDataModelVersion)\lib\net462\Sdl.Web.DataModel.dll</HintPath>
<HintPath>..\packages\Sdl.Dxa.DataModel.$(DxaDataModelVersion)\lib\net48\Sdl.Web.DataModel.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Sdl.Web.Common">
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Common.dll</HintPath>
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Common.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Sdl.Web.Tridion">
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Tridion.dll</HintPath>
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Tridion.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
Expand All @@ -70,12 +70,12 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net462\Sdl.Dxa.Framework.Web8.targets" Condition="Exists('..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net462\Sdl.Dxa.Framework.Web8.targets')" />
<Import Project="..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net48\Sdl.Dxa.Framework.Web8.targets" Condition="Exists('..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net48\Sdl.Dxa.Framework.Web8.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net462\Sdl.Dxa.Framework.Web8.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net462\Sdl.Dxa.Framework.Web8.targets')))" />
<Error Condition="!Exists('..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net48\Sdl.Dxa.Framework.Web8.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net48\Sdl.Dxa.Framework.Web8.targets')))" />
</Target>
<PropertyGroup>
<PostBuildEvent Condition="'$(TRAVIS)' == ''">REM Deploy build artifacts to DXA Site (on development machines with DXA_SITE_DIR environment variable set)
Expand Down
4 changes: 2 additions & 2 deletions webapp-net/ContextExpressions/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="DD4T.Model" version="2.2.2" targetFramework="net451" />
<package id="Sdl.Dxa.DataModel" version="2.2.0" targetFramework="net462" />
<package id="Sdl.Dxa.Framework.Web8" version="2.2.12" targetFramework="net462" />
<package id="Sdl.Dxa.DataModel" version="2.3.0" targetFramework="net48" />
<package id="Sdl.Dxa.Framework.Web8" version="2.3.0" targetFramework="net48" />
</packages>
4 changes: 2 additions & 2 deletions webapp-net/Core/Sdl.Web.Modules.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@
<Private>False</Private>
</Reference>
<Reference Include="Sdl.Web.Common">
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Common.dll</HintPath>
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Common.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Sdl.Web.Mvc">
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Mvc.dll</HintPath>
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Mvc.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion webapp-net/Core/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
<package id="Microsoft.AspNet.WebPages" version="3.3.0" allowedVersions="[3.3.0]" targetFramework="net452" />
<package id="Microsoft.Web.Infrastructure" version="2.0.0.0" allowedVersions="[2.0.0.0]" targetFramework="net452" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
<package id="Sdl.Dxa.Framework.Web8" version="2.2.12" targetFramework="net462" />
<package id="Sdl.Dxa.Framework.Web8" version="2.3.0" targetFramework="net48" />
</packages>
6 changes: 3 additions & 3 deletions webapp-net/DxaModulesCommon.Props
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
-->

<PropertyGroup>
<DxaDataModelVersion>2.2.0</DxaDataModelVersion>
<DxaFrameworkVersion>2.2.12</DxaFrameworkVersion>
<DxaDataModelVersion>2.3.0</DxaDataModelVersion>
<DxaFrameworkVersion>2.3.0</DxaFrameworkVersion>
<SdlDeliveryVersion>12.0.1197</SdlDeliveryVersion>
<SdlPCAPackageVersion>2.2.3</SdlPCAPackageVersion>
<SdlPCAPackageVersion>2.3.0</SdlPCAPackageVersion>
<AudienceManagerVersion>9.0.0</AudienceManagerVersion>
<ExperienceManagerVersion>10.0.1197</ExperienceManagerVersion>
<ContextClientVersion>12.0.1197</ContextClientVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
</Reference>
<Reference Include="Sdl.Web.Common">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Common.dll</HintPath>
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Common.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Sdl.Web.DataModel">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.DataModel.dll</HintPath>
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.DataModel.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Sdl.Web.Delivery.ADF">
Expand All @@ -62,16 +62,16 @@
<Private>False</Private>
</Reference>
<Reference Include="Sdl.Tridion.Api.Client">
<HintPath>..\packages\Sdl.Tridion.Api.Client.$(SdlPCAPackageVersion)\lib\net462\Sdl.Tridion.Api.Client.dll</HintPath>
<HintPath>..\packages\Sdl.Tridion.Api.Client.$(SdlPCAPackageVersion)\lib\net48\Sdl.Tridion.Api.Client.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Sdl.Web.Mvc">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Mvc.dll</HintPath>
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Mvc.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Sdl.Web.Tridion">
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Tridion.dll</HintPath>
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Tridion.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
Expand Down
4 changes: 2 additions & 2 deletions webapp-net/DynamicDocumentation/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<package id="Microsoft.AspNet.WebPages" version="3.3.0" targetFramework="net452" />
<package id="Microsoft.Web.Infrastructure" version="2.0.0.0" targetFramework="net452" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
<package id="Sdl.Dxa.Framework.Web8" version="2.2.12" targetFramework="net462" />
<package id="Sdl.Dxa.Framework.Web8" version="2.3.0" targetFramework="net48" />
<package id="Sdl.Dxa.Modules.DynamicDocumentation.Boilerplate" version="2.2.0" targetFramework="net462" />
<package id="Sdl.Web.Delivery" version="12.0.1197" targetFramework="net48" />
<package id="Sdl.Tridion.Api.Client" version="2.2.2" targetFramework="net462" />
<package id="Sdl.Tridion.Api.Client" version="2.3.0" targetFramework="net48" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,19 @@
</Reference>
<Reference Include="Sdl.Web.DataModel">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Sdl.Dxa.DataModel.$(DxaDataModelVersion)\lib\net462\Sdl.Web.DataModel.dll</HintPath>
<HintPath>..\packages\Sdl.Dxa.DataModel.$(DxaDataModelVersion)\lib\net48\Sdl.Web.DataModel.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Sdl.Web.Common">
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Common.dll</HintPath>
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Common.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Sdl.Web.Mvc">
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Mvc.dll</HintPath>
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Mvc.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Sdl.Web.Tridion">
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Tridion.dll</HintPath>
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Tridion.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
Expand Down Expand Up @@ -110,12 +110,12 @@ xcopy "$(ProjectDir)Areas" "%25DXA_SITE_DIR%25\Areas" /S /I /Y
)
</PostBuildEvent>
</PropertyGroup>
<Import Project="..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net462\Sdl.Dxa.Framework.Web8.targets" Condition="Exists('..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net462\Sdl.Dxa.Framework.Web8.targets')" />
<Import Project="..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net48\Sdl.Dxa.Framework.Web8.targets" Condition="Exists('..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net48\Sdl.Dxa.Framework.Web8.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net462\Sdl.Dxa.Framework.Web8.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net462\Sdl.Dxa.Framework.Web8.targets')))" />
<Error Condition="!Exists('..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net48\Sdl.Dxa.Framework.Web8.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\build\net48\Sdl.Dxa.Framework.Web8.targets')))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
Loading

0 comments on commit 0b6ecdb

Please sign in to comment.