Skip to content

Commit 2759c7f

Browse files
avmganavmgan
authored
Merge pull request #84 from RWS/develop
Updated Final DXA 2.3 framework release changes dependencies
2 parents 699a2ba + 0b6ecdb commit 2759c7f

30 files changed

+87
-87
lines changed

‎webapp-net/51Degrees/Sdl.Web.Modules.Degrees51.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@
3939
<HintPath>..\packages\51Degrees.mobi.3.2.7.3\lib\NET40\FiftyOne.Foundation.dll</HintPath>
4040
</Reference>
4141
<Reference Include="Sdl.Web.Common">
42-
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Common.dll</HintPath>
42+
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Common.dll</HintPath>
4343
<Private>False</Private>
4444
</Reference>
4545
<Reference Include="Sdl.Web.Context.Api">
4646
<HintPath>..\packages\Sdl.Web.Context.Client.11.0.0\lib\net462\Sdl.Web.Context.Api.dll</HintPath>
4747
<Private>False</Private>
4848
</Reference>
4949
<Reference Include="Sdl.Web.Mvc">
50-
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Mvc.dll</HintPath>
50+
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Mvc.dll</HintPath>
5151
<Private>False</Private>
5252
</Reference>
5353
<Reference Include="System" />
@@ -76,12 +76,12 @@
7676
<None Include="packages.config" />
7777
</ItemGroup>
7878
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
79-
<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')" />
79+
<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')" />
8080
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
8181
<PropertyGroup>
8282
<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>
8383
</PropertyGroup>
84-
<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')))" />
84+
<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')))" />
8585
</Target>
8686
<PropertyGroup>
8787
<PostBuildEvent Condition="'$(TRAVIS)' == ''">REM Deploy build artifacts to DXA Site (on development machines with DXA_SITE_DIR environment variable set)

‎webapp-net/51Degrees/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="Microsoft.AspNet.Mvc" version="5.3.0" targetFramework="net452" />
44
<package id="51Degrees.mobi" version="3.2.7.3" targetFramework="net452" />
55
<package id="Microsoft.Web.Infrastructure" version="2.0.0.0" targetFramework="net452" />
6-
<package id="Sdl.Dxa.Framework.Web8" version="2.2.12" targetFramework="net462" />
6+
<package id="Sdl.Dxa.Framework.Web8" version="2.3.0" targetFramework="net48" />
77
<package id="Sdl.Web.Context.Client" version="11.0.0" targetFramework="net462" />
88
<package id="Sdl.Web.Delivery" version="11.0.0" targetFramework="net462" />
99
</packages>

‎webapp-net/AudienceManager/Sdl.Web.Modules.AudienceManager.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@
4646
</Reference>
4747
<Reference Include="Sdl.Web.Common">
4848
<SpecificVersion>False</SpecificVersion>
49-
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Common.dll</HintPath>
49+
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Common.dll</HintPath>
5050
<Private>False</Private>
5151
</Reference>
5252
<Reference Include="Sdl.Web.Mvc">
53-
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Mvc.dll</HintPath>
53+
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Mvc.dll</HintPath>
5454
<Private>False</Private>
5555
</Reference>
5656
<Reference Include="System" />

‎webapp-net/AudienceManager/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
<package id="Microsoft.AspNet.WebPages.Data" version="3.3.0" targetFramework="net452" />
77
<package id="Microsoft.AspNet.WebPages.WebData" version="3.3.0" targetFramework="net452" />
88
<package id="Sdl.AudienceManager.ContentDelivery" version="9.0.0" targetFramework="net462" />
9-
<package id="Sdl.Dxa.Framework.Web8" version="2.2.12" targetFramework="net462" />
9+
<package id="Sdl.Dxa.Framework.Web8" version="2.3.0" targetFramework="net48" />
1010
<package id="Sdl.Web.Delivery" version="11.0.0" targetFramework="net462" />
1111
</packages>

‎webapp-net/AzureWebApp/Sdl.Web.Modules.AzureWebApp.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@
6868
<Private>False</Private>
6969
</Reference>
7070
<Reference Include="Sdl.Web.Common">
71-
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Common.dll</HintPath>
71+
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Common.dll</HintPath>
7272
<Private>False</Private>
7373
</Reference>
7474
<Reference Include="Sdl.Web.Mvc">
75-
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Mvc.dll</HintPath>
75+
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Mvc.dll</HintPath>
7676
<Private>False</Private>
7777
</Reference>
7878
<Reference Include="System" />
@@ -133,12 +133,12 @@
133133
<Content Include="scripts\ai.0.22.17-build00153.min.js" />
134134
</ItemGroup>
135135
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
136-
<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')" />
136+
<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')" />
137137
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
138138
<PropertyGroup>
139139
<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>
140140
</PropertyGroup>
141-
<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')))" />
141+
<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')))" />
142142
<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'))" />
143143
<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'))" />
144144
<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'))" />

‎webapp-net/AzureWebApp/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<package id="Microsoft.AspNet.WebPages" version="3.3.0" targetFramework="net45" />
1717
<package id="Microsoft.Web.Infrastructure" version="2.0.0.0" targetFramework="net45" />
1818
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
19-
<package id="Sdl.Dxa.Framework.Web8" version="2.2.12" targetFramework="net462" />
19+
<package id="Sdl.Dxa.Framework.Web8" version="2.3.0" targetFramework="net48" />
2020
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
2121
<package id="System.Diagnostics.DiagnosticSource" version="5.0.0" targetFramework="net48" />
2222
<package id="System.Memory" version="4.5.4" targetFramework="net48" />

‎webapp-net/ContextExpressions/Sdl.Web.Modules.ContextExpressions.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@
4040
</Reference>
4141
<Reference Include="Sdl.Web.DataModel">
4242
<SpecificVersion>False</SpecificVersion>
43-
<HintPath>..\packages\Sdl.Dxa.DataModel.$(DxaDataModelVersion)\lib\net462\Sdl.Web.DataModel.dll</HintPath>
43+
<HintPath>..\packages\Sdl.Dxa.DataModel.$(DxaDataModelVersion)\lib\net48\Sdl.Web.DataModel.dll</HintPath>
4444
<Private>False</Private>
4545
</Reference>
4646
<Reference Include="Sdl.Web.Common">
47-
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Common.dll</HintPath>
47+
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Common.dll</HintPath>
4848
<Private>False</Private>
4949
</Reference>
5050
<Reference Include="Sdl.Web.Tridion">
51-
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Tridion.dll</HintPath>
51+
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Tridion.dll</HintPath>
5252
<Private>False</Private>
5353
</Reference>
5454
<Reference Include="System" />
@@ -70,12 +70,12 @@
7070
<None Include="packages.config" />
7171
</ItemGroup>
7272
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
73-
<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')" />
73+
<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')" />
7474
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
7575
<PropertyGroup>
7676
<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>
7777
</PropertyGroup>
78-
<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')))" />
78+
<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')))" />
7979
</Target>
8080
<PropertyGroup>
8181
<PostBuildEvent Condition="'$(TRAVIS)' == ''">REM Deploy build artifacts to DXA Site (on development machines with DXA_SITE_DIR environment variable set)

‎webapp-net/ContextExpressions/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="DD4T.Model" version="2.2.2" targetFramework="net451" />
4-
<package id="Sdl.Dxa.DataModel" version="2.2.0" targetFramework="net462" />
5-
<package id="Sdl.Dxa.Framework.Web8" version="2.2.12" targetFramework="net462" />
4+
<package id="Sdl.Dxa.DataModel" version="2.3.0" targetFramework="net48" />
5+
<package id="Sdl.Dxa.Framework.Web8" version="2.3.0" targetFramework="net48" />
66
</packages>

‎webapp-net/Core/Sdl.Web.Modules.Core.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@
5555
<Private>False</Private>
5656
</Reference>
5757
<Reference Include="Sdl.Web.Common">
58-
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Common.dll</HintPath>
58+
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Common.dll</HintPath>
5959
<Private>False</Private>
6060
</Reference>
6161
<Reference Include="Sdl.Web.Mvc">
62-
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net462\Sdl.Web.Mvc.dll</HintPath>
62+
<HintPath>..\packages\Sdl.Dxa.Framework.Web8.$(DxaFrameworkVersion)\lib\net48\Sdl.Web.Mvc.dll</HintPath>
6363
<Private>False</Private>
6464
</Reference>
6565
<Reference Include="System" />

‎webapp-net/Core/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
<package id="Microsoft.AspNet.WebPages" version="3.3.0" allowedVersions="[3.3.0]" targetFramework="net452" />
77
<package id="Microsoft.Web.Infrastructure" version="2.0.0.0" allowedVersions="[2.0.0.0]" targetFramework="net452" />
88
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
9-
<package id="Sdl.Dxa.Framework.Web8" version="2.2.12" targetFramework="net462" />
9+
<package id="Sdl.Dxa.Framework.Web8" version="2.3.0" targetFramework="net48" />
1010
</packages>

0 commit comments

Comments
 (0)