Skip to content

Commit

Permalink
2.12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tatarincev committed Sep 26, 2016
1 parent 0737316 commit 6edb8ef
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 40 deletions.
4 changes: 2 additions & 2 deletions CommonAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
[assembly: AssemblyProduct("Virto Commerce Order Module")]
[assembly: AssemblyCopyright("Copyright © VirtoCommerce 2011-2016")]

[assembly: AssemblyFileVersion("2.11.1.0")]
[assembly: AssemblyVersion("2.11.1.0")]
[assembly: AssemblyFileVersion("2.12.0.0")]
[assembly: AssemblyVersion("2.12.0.0")]

#if DEBUG
[assembly: AssemblyConfiguration("Debug")]
Expand Down
1 change: 0 additions & 1 deletion NuGet/build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ IF NOT DEFINED MSBUILD_PATH SET MSBUILD_PATH=%WINDIR%\Microsoft.NET\Framework\v4

"%MSBUILD_PATH%" "%SOURCE_DIR%\VirtoCommerce.OrderModule.sln" /nologo /verbosity:m /t:Build /p:Configuration=Release;Platform="Any CPU"

nuget pack "%SOURCE_DIR%\VirtoCommerce.OrderModule.Client\VirtoCommerce.OrderModule.Client.csproj" -IncludeReferencedProjects -Symbols -Properties Configuration=Release -o "%TARGET_DIR%"
nuget pack "%SOURCE_DIR%\VirtoCommerce.OrderModule.Data\VirtoCommerce.OrderModule.Data.csproj" -IncludeReferencedProjects -Symbols -Properties Configuration=Release -o "%TARGET_DIR%"

@pause
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,16 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="VirtoCommerce.Domain, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Domain.3.0.0-rc1\lib\net451\VirtoCommerce.Domain.dll</HintPath>
<Reference Include="VirtoCommerce.Domain, Version=2.17.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Domain.2.17.0\lib\net451\VirtoCommerce.Domain.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="VirtoCommerce.Platform.Core, Version=2.12.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Platform.Core.2.12.0-rc5\lib\net451\VirtoCommerce.Platform.Core.dll</HintPath>
<HintPath>..\packages\VirtoCommerce.Platform.Core.2.12.0\lib\net451\VirtoCommerce.Platform.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="VirtoCommerce.Platform.Data, Version=2.12.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Platform.Data.2.12.0-rc1\lib\net451\VirtoCommerce.Platform.Data.dll</HintPath>
<HintPath>..\packages\VirtoCommerce.Platform.Data.2.12.0\lib\net451\VirtoCommerce.Platform.Data.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package>
<metadata>
<id>$id$</id>
<version>2.12.0-rc6</version>
<version>2.12.0</version>
<title>$title$</title>
<authors>VirtoCommerce</authors>
<owners>VirtoCommerce</owners>
Expand Down
6 changes: 3 additions & 3 deletions VirtoCommerce.OrderModule.Data/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<package id="EntityFramework" version="6.1.1" targetFramework="net451" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net451" />
<package id="valueinjecter" version="2.3.3" targetFramework="net451" />
<package id="VirtoCommerce.Domain" version="3.0.0-rc1" targetFramework="net451" />
<package id="VirtoCommerce.Platform.Core" version="2.12.0-rc5" targetFramework="net451" />
<package id="VirtoCommerce.Platform.Data" version="2.12.0-rc1" targetFramework="net451" />
<package id="VirtoCommerce.Domain" version="2.17.0" targetFramework="net451" />
<package id="VirtoCommerce.Platform.Core" version="2.12.0" targetFramework="net451" />
<package id="VirtoCommerce.Platform.Data" version="2.12.0" targetFramework="net451" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -90,20 +90,20 @@
<HintPath>..\packages\VirtoCommerce.CartModule.Data.2.11.0\lib\net451\VirtoCommerce.CartModule.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="VirtoCommerce.CoreModule.Data, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.CoreModule.Data.3.0.0-rc1\lib\net451\VirtoCommerce.CoreModule.Data.dll</HintPath>
<Reference Include="VirtoCommerce.CoreModule.Data, Version=2.17.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.CoreModule.Data.2.17.0\lib\net451\VirtoCommerce.CoreModule.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="VirtoCommerce.Domain, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Domain.3.0.0-rc1\lib\net451\VirtoCommerce.Domain.dll</HintPath>
<Reference Include="VirtoCommerce.Domain, Version=2.17.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Domain.2.17.0\lib\net451\VirtoCommerce.Domain.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="VirtoCommerce.Platform.Core, Version=2.12.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Platform.Core.2.12.0-rc5\lib\net451\VirtoCommerce.Platform.Core.dll</HintPath>
<HintPath>..\packages\VirtoCommerce.Platform.Core.2.12.0\lib\net451\VirtoCommerce.Platform.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="VirtoCommerce.Platform.Data, Version=2.12.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Platform.Data.2.12.0-rc1\lib\net451\VirtoCommerce.Platform.Data.dll</HintPath>
<HintPath>..\packages\VirtoCommerce.Platform.Data.2.12.0\lib\net451\VirtoCommerce.Platform.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="VirtoCommerce.Platform.Testing, Version=2.11.2.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down
8 changes: 4 additions & 4 deletions VirtoCommerce.OrderModule.Test/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net451" />
<package id="valueinjecter" version="2.3.3" targetFramework="net451" />
<package id="VirtoCommerce.CartModule.Data" version="2.11.0" targetFramework="net451" />
<package id="VirtoCommerce.CoreModule.Data" version="3.0.0-rc1" targetFramework="net451" />
<package id="VirtoCommerce.Domain" version="3.0.0-rc1" targetFramework="net451" />
<package id="VirtoCommerce.Platform.Core" version="2.12.0-rc5" targetFramework="net451" />
<package id="VirtoCommerce.Platform.Data" version="2.12.0-rc1" targetFramework="net451" />
<package id="VirtoCommerce.CoreModule.Data" version="2.17.0" targetFramework="net451" />
<package id="VirtoCommerce.Domain" version="2.17.0" targetFramework="net451" />
<package id="VirtoCommerce.Platform.Core" version="2.12.0" targetFramework="net451" />
<package id="VirtoCommerce.Platform.Data" version="2.12.0" targetFramework="net451" />
<package id="VirtoCommerce.Platform.Testing" version="2.11.2" targetFramework="net451" />
<package id="xunit" version="2.1.0" targetFramework="net451" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net451" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,24 +124,24 @@
<Reference Include="System.Web.Services" />
<Reference Include="System.EnterpriseServices" />
<Reference Include="System.Xml.Linq" />
<Reference Include="VirtoCommerce.CoreModule.Data, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.CoreModule.Data.3.0.0-rc1\lib\net451\VirtoCommerce.CoreModule.Data.dll</HintPath>
<Reference Include="VirtoCommerce.CoreModule.Data, Version=2.17.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.CoreModule.Data.2.17.0\lib\net451\VirtoCommerce.CoreModule.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="VirtoCommerce.Domain, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Domain.3.0.0-rc1\lib\net451\VirtoCommerce.Domain.dll</HintPath>
<Reference Include="VirtoCommerce.Domain, Version=2.17.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Domain.2.17.0\lib\net451\VirtoCommerce.Domain.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="VirtoCommerce.Platform.Core, Version=2.12.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Platform.Core.2.12.0-rc5\lib\net451\VirtoCommerce.Platform.Core.dll</HintPath>
<HintPath>..\packages\VirtoCommerce.Platform.Core.2.12.0\lib\net451\VirtoCommerce.Platform.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="VirtoCommerce.Platform.Core.Web, Version=2.12.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Platform.Core.Web.2.12.0-rc1\lib\net451\VirtoCommerce.Platform.Core.Web.dll</HintPath>
<HintPath>..\packages\VirtoCommerce.Platform.Core.Web.2.12.0\lib\net451\VirtoCommerce.Platform.Core.Web.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="VirtoCommerce.Platform.Data, Version=2.12.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Platform.Data.2.12.0-rc1\lib\net451\VirtoCommerce.Platform.Data.dll</HintPath>
<HintPath>..\packages\VirtoCommerce.Platform.Data.2.12.0\lib\net451\VirtoCommerce.Platform.Data.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
Expand Down Expand Up @@ -270,12 +270,12 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="..\packages\VirtoCommerce.Module.0.8.0\build\VirtoCommerce.Module.targets" Condition="Exists('..\packages\VirtoCommerce.Module.0.8.0\build\VirtoCommerce.Module.targets')" />
<Import Project="..\packages\VirtoCommerce.Module.0.9.0\build\VirtoCommerce.Module.targets" Condition="Exists('..\packages\VirtoCommerce.Module.0.9.0\build\VirtoCommerce.Module.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\VirtoCommerce.Module.0.8.0\build\VirtoCommerce.Module.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\VirtoCommerce.Module.0.8.0\build\VirtoCommerce.Module.targets'))" />
<Error Condition="!Exists('..\packages\VirtoCommerce.Module.0.9.0\build\VirtoCommerce.Module.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\VirtoCommerce.Module.0.9.0\build\VirtoCommerce.Module.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
8 changes: 4 additions & 4 deletions VirtoCommerce.OrderModule.Web/module.manifest
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8" ?>
<module>
<id>VirtoCommerce.Orders</id>
<version>2.11.2</version>
<platformVersion>2.11.5</platformVersion>
<version>2.12.0</version>
<platformVersion>2.12.0</platformVersion>
<dependencies>
<dependency id="VirtoCommerce.Core" version="2.11.0" />
<dependency id="VirtoCommerce.Catalog" version="2.11.0" />
<dependency id="VirtoCommerce.Core" version="2.17.0" />
<dependency id="VirtoCommerce.Catalog" version="2.12.0" />
<dependency id="VirtoCommerce.Pricing" version="2.11.0" />
<dependency id="VirtoCommerce.Customer" version="2.11.0" />
</dependencies>
Expand Down
12 changes: 6 additions & 6 deletions VirtoCommerce.OrderModule.Web/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
<package id="Owin" version="1.0" targetFramework="net451" />
<package id="Unity" version="4.0.1" targetFramework="net451" />
<package id="valueinjecter" version="2.3.3" targetFramework="net451" />
<package id="VirtoCommerce.CoreModule.Data" version="3.0.0-rc1" targetFramework="net451" />
<package id="VirtoCommerce.Domain" version="3.0.0-rc1" targetFramework="net451" />
<package id="VirtoCommerce.Module" version="0.8.0" targetFramework="net451" developmentDependency="true" />
<package id="VirtoCommerce.Platform.Core" version="2.12.0-rc5" targetFramework="net451" />
<package id="VirtoCommerce.Platform.Core.Web" version="2.12.0-rc1" targetFramework="net451" />
<package id="VirtoCommerce.Platform.Data" version="2.12.0-rc1" targetFramework="net451" />
<package id="VirtoCommerce.CoreModule.Data" version="2.17.0" targetFramework="net451" />
<package id="VirtoCommerce.Domain" version="2.17.0" targetFramework="net451" />
<package id="VirtoCommerce.Module" version="0.9.0" targetFramework="net451" developmentDependency="true" />
<package id="VirtoCommerce.Platform.Core" version="2.12.0" targetFramework="net451" />
<package id="VirtoCommerce.Platform.Core.Web" version="2.12.0" targetFramework="net451" />
<package id="VirtoCommerce.Platform.Data" version="2.12.0" targetFramework="net451" />
</packages>

0 comments on commit 6edb8ef

Please sign in to comment.