Skip to content
This repository has been archived by the owner on Dec 6, 2019. It is now read-only.

Feature/upgrade to 9.1.1 #469

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions nuget.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<add key="Nuget v3" value="https://api.nuget.org/v3/index.json" />
<add key="Sitecore v2" value="https://sitecore.myget.org/F/sc-platform-9-1/api/v2" />
<add key="Sitecore v3" value="https://sitecore.myget.org/F/sc-platform-9-1/api/v3/index.json" />
<add key="Sitecore-9.1.1" value="https://sitecore.myget.org/F/sc-packages/api/v3/index.json" />
</packageSources>

<activePackageSource>
Expand Down
6 changes: 3 additions & 3 deletions scripts/NuGet/ConvertToNewNuget.ps1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
## Nuget v2 URL for the target platform, and the target marketing version
$SitecoreNuget = "https://sitecore.myget.org/F/sc-platform-9-1/api/v2"
$TargetVersion = "9.1.0"
$SitecoreNuget = "https://sitecore.myget.org/F/sc-packages/api/v2"
$TargetVersion = "9.1.1"

## Nuget URL to retrieve package metadata, including dependencies
$MetaPackage = "$SitecoreNuget/Packages(Id='Sitecore.Experience.Platform',Version='$TargetVersion')"
$MetaPackage = "$SitecoreNuget/Packages(Id='Sitecore',Version='$TargetVersion')"

## Retrieve the package metadata from nuget (no nice way of doing this via CLI)
$PackageMetadata = [xml](Invoke-WebRequest $MetaPackage).Content
Expand Down
36 changes: 18 additions & 18 deletions src/Feature/Accounts/Tests/Sitecore.Feature.Accounts.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -147,19 +147,19 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="Sitecore.Analytics.Core" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Analytics.DataAccess" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Analytics.Model" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Analytics" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Analytics.Core" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Analytics.DataAccess" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Analytics.Model" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Analytics" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Framework.Conditions" Version="[3.1.0]" />
<PackageReference Include="Sitecore.Kernel" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Logging" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Nexus" Version="[3.0.0]" />
<PackageReference Include="Sitecore.XConnect" Version="[2.0.0]" />
<PackageReference Include="Sitecore.XConnect.Collection.Model" Version="[2.0.0]" />
<PackageReference Include="Sitecore.XConnect" Version="[2.0.0]" />
<PackageReference Include="Sitecore.XConnect.Search" Version="[2.0.0]" />
<PackageReference Include="Sitecore.Xdb.Common.Web" Version="[3.0.3]" />
<PackageReference Include="Sitecore.Kernel" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Logging" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Nexus" Version="[9.1.1]" />
<PackageReference Include="Sitecore.XConnect" Version="[9.1.1]" />
<PackageReference Include="Sitecore.XConnect.Collection.Model" Version="[9.1.1]" />
<PackageReference Include="Sitecore.XConnect" Version="[9.1.1]" />
<PackageReference Include="Sitecore.XConnect.Search" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Xdb.Common.Web" Version="[9.1.1]" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down Expand Up @@ -241,11 +241,11 @@
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- 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.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</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.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
20 changes: 10 additions & 10 deletions src/Feature/Accounts/code/Sitecore.Feature.Accounts.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -121,16 +121,16 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="Sitecore.Analytics.Core" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Analytics.Model" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Analytics" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Kernel" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Owin.Authentication" Version="[2.0.0]" />
<PackageReference Include="Sitecore.Owin" Version="[2.0.0]" />
<PackageReference Include="Sitecore.XConnect.Client.Configuration" Version="[2.0.0]" />
<PackageReference Include="Sitecore.XConnect.Client" Version="[2.0.0]" />
<PackageReference Include="Sitecore.XConnect.Collection.Model" Version="[2.0.0]" />
<PackageReference Include="Sitecore.XConnect" Version="[2.0.0]" />
<PackageReference Include="Sitecore.Analytics.Core" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Analytics.Model" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Analytics" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Kernel" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Owin.Authentication" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Owin" Version="[9.1.1]" />
<PackageReference Include="Sitecore.XConnect.Client.Configuration" Version="[9.1.1]" />
<PackageReference Include="Sitecore.XConnect.Client" Version="[9.1.1]" />
<PackageReference Include="Sitecore.XConnect.Collection.Model" Version="[9.1.1]" />
<PackageReference Include="Sitecore.XConnect" Version="[9.1.1]" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
76 changes: 38 additions & 38 deletions src/Feature/Demo/code/Sitecore.Feature.Demo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -212,39 +212,39 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="Sitecore.Analytics.Core" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Analytics.Model" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Analytics" Version="[12.0.0]" />
<PackageReference Include="Sitecore.CES.DeviceDetection" Version="[3.0.0]" />
<PackageReference Include="Sitecore.Cintel" Version="[4.0.0]" />
<PackageReference Include="Sitecore.ExperienceAnalytics.Api" Version="[4.0.0]" />
<PackageReference Include="Sitecore.ExperienceAnalytics.Core" Version="[4.0.0]" />
<PackageReference Include="Sitecore.ExperienceExplorer.Core" Version="[4.0.0]" />
<PackageReference Include="Sitecore.Analytics.Core" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Analytics.Model" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Analytics" Version="[9.1.1]" />
<PackageReference Include="Sitecore.CES.DeviceDetection" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Cintel" Version="[9.1.1]" />
<PackageReference Include="Sitecore.ExperienceAnalytics.Api" Version="[9.1.1]" />
<PackageReference Include="Sitecore.ExperienceAnalytics.Core" Version="[9.1.1]" />
<PackageReference Include="Sitecore.ExperienceExplorer.Core" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Framework.Conditions" Version="[3.1.0]" />
<PackageReference Include="Sitecore.Kernel" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Mvc" Version="[3.0.0]" />
<PackageReference Include="Sitecore.Marketing" Version="[13.0.0]" />
<PackageReference Include="Sitecore.Marketing.Automation" Version="[3.0.0]" />
<PackageReference Include="Sitecore.Marketing.Core" Version="[13.0.0]" />
<PackageReference Include="Sitecore.Marketing.Taxonomy" Version="[13.0.0]" />
<PackageReference Include="Sitecore.Mvc.Analytics" Version="[12.0.0]" />
<PackageReference Include="Sitecore.XConnect" Version="[2.0.0]" />
<PackageReference Include="Sitecore.XConnect.Client.Configuration" Version="[2.0.0]" />
<PackageReference Include="Sitecore.XConnect.Client" Version="[2.0.0]" />
<PackageReference Include="Sitecore.XConnect.Collection.Model" Version="[2.0.0]" />
<PackageReference Include="Sitecore.XConnect.Diagnostics" Version="[2.0.0]" />
<PackageReference Include="Sitecore.XConnect" Version="[2.0.0]" />
<PackageReference Include="Sitecore.XConnect.Search" Version="[2.0.0]" />
<PackageReference Include="Sitecore.XConnect.Search" Version="[2.0.0]" />
<PackageReference Include="Sitecore.XConnect.Segmentation.Conditions" Version="[5.0.0]" />
<PackageReference Include="Sitecore.XConnect.Segmentation.Engine" Version="[5.0.0]" />
<PackageReference Include="Sitecore.XConnect.Segmentation.ExpressionBuilder.Model" Version="[5.0.0]" />
<PackageReference Include="Sitecore.XConnect.Segmentation.Predicates.Model" Version="[5.0.0]" />
<PackageReference Include="Sitecore.XConnect.Segmentation.Predicates" Version="[5.0.0]" />
<PackageReference Include="Sitecore.Xdb.MarketingAutomation.Tracking" Version="[2.0.0]" />
<PackageReference Include="Sitecore.Xdb.ReferenceData.Core" Version="[2.0.0]" />
<PackageReference Include="Sitecore.ExperienceEditor" Version="[5.0.0]" />
<PackageReference Include="Sitecore.CES.GeoIP.Core" Version="[3.0.0]" />
<PackageReference Include="Sitecore.Kernel" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Mvc" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Marketing" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Marketing.Automation" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Marketing.Core" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Marketing.Taxonomy" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Mvc.Analytics" Version="[9.1.1]" />
<PackageReference Include="Sitecore.XConnect" Version="[9.1.1]" />
<PackageReference Include="Sitecore.XConnect.Client.Configuration" Version="[9.1.1]" />
<PackageReference Include="Sitecore.XConnect.Client" Version="[9.1.1]" />
<PackageReference Include="Sitecore.XConnect.Collection.Model" Version="[9.1.1]" />
<PackageReference Include="Sitecore.XConnect.Diagnostics" Version="[9.1.1]" />
<PackageReference Include="Sitecore.XConnect" Version="[9.1.1]" />
<PackageReference Include="Sitecore.XConnect.Search" Version="[9.1.1]" />
<PackageReference Include="Sitecore.XConnect.Search" Version="[9.1.1]" />
<PackageReference Include="Sitecore.XConnect.Segmentation.Conditions" Version="[9.1.1]" />
<PackageReference Include="Sitecore.XConnect.Segmentation.Engine" Version="[9.1.1]" />
<PackageReference Include="Sitecore.XConnect.Segmentation.ExpressionBuilder.Model" Version="[9.1.1]" />
<PackageReference Include="Sitecore.XConnect.Segmentation.Predicates.Model" Version="[9.1.1]" />
<PackageReference Include="Sitecore.XConnect.Segmentation.Predicates" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Xdb.MarketingAutomation.Tracking" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Xdb.ReferenceData.Core" Version="[9.1.1]" />
<PackageReference Include="Sitecore.ExperienceEditor" Version="[9.1.1]" />
<PackageReference Include="Sitecore.CES.GeoIP.Core" Version="[9.1.1]" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down Expand Up @@ -396,11 +396,11 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<!-- 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.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</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.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
28 changes: 14 additions & 14 deletions src/Feature/Demo/tests/Sitecore.Feature.Demo.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -145,20 +145,20 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="Sitecore.Analytics.Core" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Analytics.DataAccess" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Analytics.Model" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Analytics" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Kernel" Version="[12.0.0]" />
<PackageReference Include="Sitecore.ExperienceEditor" Version="[5.0.0]" />
<PackageReference Include="Sitecore.Logging" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Marketing" Version="[13.0.0]" />
<PackageReference Include="Sitecore.Marketing.Taxonomy" Version="[13.0.0]" />
<PackageReference Include="Sitecore.ExperienceExplorer.Core" Version="[4.0.0]" />
<PackageReference Include="Sitecore.Mvc" Version="[3.0.0]" />
<PackageReference Include="Sitecore.Cintel" Version="[4.0.0]" />
<PackageReference Include="Sitecore.Nexus" Version="[3.0.0]" />
<PackageReference Include="Sitecore.Xdb.Configuration" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Analytics.Core" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Analytics.DataAccess" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Analytics.Model" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Analytics" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Kernel" Version="[9.1.1]" />
<PackageReference Include="Sitecore.ExperienceEditor" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Logging" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Marketing" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Marketing.Taxonomy" Version="[9.1.1]" />
<PackageReference Include="Sitecore.ExperienceExplorer.Core" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Mvc" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Cintel" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Nexus" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Xdb.Configuration" Version="[9.1.1]" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
2 changes: 1 addition & 1 deletion src/Feature/Identity/code/Sitecore.Feature.Identity.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="Sitecore.Kernel" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Kernel" Version="[9.1.1]" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="Sitecore.Analytics" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Kernel" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Logging" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Nexus" Version="[3.0.0]" />
<PackageReference Include="Sitecore.Analytics" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Kernel" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Logging" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Nexus" Version="[9.1.1]" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
2 changes: 1 addition & 1 deletion src/Feature/Language/code/Sitecore.Feature.Language.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="Sitecore.Kernel" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Kernel" Version="[9.1.1]" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
6 changes: 3 additions & 3 deletions src/Feature/Maps/code/Sitecore.Feature.Maps.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="Sitecore.Kernel" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Mvc" Version="[3.0.0]" />
<PackageReference Include="Sitecore.Speak.Client" Version="[4.0.0]" />
<PackageReference Include="Sitecore.Kernel" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Mvc" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Speak.Client" Version="[9.1.1]" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
10 changes: 5 additions & 5 deletions src/Feature/Maps/tests/Sitecore.Feature.Maps.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,11 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="Sitecore.Analytics" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Kernel" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Logging" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Mvc" Version="[3.0.0]" />
<PackageReference Include="Sitecore.Nexus" Version="[3.0.0]" />
<PackageReference Include="Sitecore.Analytics" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Kernel" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Logging" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Mvc" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Nexus" Version="[9.1.1]" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
10 changes: 5 additions & 5 deletions src/Feature/Media/Tests/Sitecore.Feature.Media.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,11 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="Sitecore.Analytics" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Kernel" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Mvc" Version="[3.0.0]" />
<PackageReference Include="Sitecore.Logging" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Nexus" Version="[3.0.0]" />
<PackageReference Include="Sitecore.Analytics" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Kernel" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Mvc" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Logging" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Nexus" Version="[9.1.1]" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
4 changes: 2 additions & 2 deletions src/Feature/Media/code/Sitecore.Feature.Media.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="Sitecore.Kernel" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Mvc" Version="[3.0.0]" />
<PackageReference Include="Sitecore.Kernel" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Mvc" Version="[9.1.1]" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
4 changes: 2 additions & 2 deletions src/Feature/Metadata/code/Sitecore.Feature.Metadata.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="Sitecore.Kernel" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Mvc" Version="[3.0.0]" />
<PackageReference Include="Sitecore.Kernel" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Mvc" Version="[9.1.1]" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="Sitecore.Kernel" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Kernel" Version="[9.1.1]" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="Sitecore.Analytics" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Kernel" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Logging" Version="[12.0.0]" />
<PackageReference Include="Sitecore.Nexus" Version="[3.0.0]" />
<PackageReference Include="Sitecore.Analytics" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Kernel" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Logging" Version="[9.1.1]" />
<PackageReference Include="Sitecore.Nexus" Version="[9.1.1]" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
Loading