Skip to content

Commit

Permalink
1.0.5
Browse files Browse the repository at this point in the history
Added nuget packages
  • Loading branch information
tatarincev committed Dec 20, 2017
1 parent f030bf3 commit 5d45fcd
Show file tree
Hide file tree
Showing 16 changed files with 195 additions and 45 deletions.
65 changes: 65 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 4
end_of_line = crlf
trim_trailing_whitespace = true
insert_final_newline = true

# Dotnet code style settings:
[*.{cs,vb}]

# Sort using and Import directives with System.* appearing first
dotnet_sort_system_directives_first = true

# Avoid "this." and "Me." if not necessary
dotnet_style_qualification_for_field = false:suggestion
dotnet_style_qualification_for_property = false:suggestion
dotnet_style_qualification_for_method = false:suggestion
dotnet_style_qualification_for_event = false:suggestion

# Use language keywords instead of framework type names for type references
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
dotnet_style_predefined_type_for_member_access = true:suggestion

# Suggest more modern language features when available
dotnet_style_object_initializer = true:suggestion
dotnet_style_collection_initializer = true:suggestion
dotnet_style_coalesce_expression = true:suggestion
dotnet_style_null_propagation = true:suggestion
dotnet_style_explicit_tuple_names = true:suggestion

# CSharp code style settings:
[*.cs]

# Prefer "var" everywhere
csharp_style_var_for_built_in_types = true:suggestion
csharp_style_var_when_type_is_apparent = true:suggestion
csharp_style_var_elsewhere = true:suggestion

# Prefer method-like constructs to have a block body
csharp_style_expression_bodied_methods = false:none
csharp_style_expression_bodied_constructors = false:none
csharp_style_expression_bodied_operators = false:none

# Prefer property-like constructs to have an expression-body
csharp_style_expression_bodied_properties = true:none
csharp_style_expression_bodied_indexers = true:none
csharp_style_expression_bodied_accessors = true:none

# Suggest more modern language features when available
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
csharp_style_inlined_variable_declaration = true:suggestion
csharp_style_throw_expression = true:suggestion
csharp_style_conditional_delegate_call = true:suggestion

# Newline settings
csharp_new_line_before_open_brace = all
csharp_new_line_before_else = true
csharp_new_line_before_catch = true
csharp_new_line_before_finally = true
csharp_new_line_before_members_in_object_initializers = true
csharp_new_line_before_members_in_anonymous_types = true
9 changes: 9 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Contributing
-----------
We welcome & recognize contributors to Virto Commerce. There are many benefits available for our contributers, from special licensing to project involvement and access to private repositories. Follow the guide below to contribute:

1. Before starting work on a new contribution, take a moment and search the commits and issues for similar proposals.
2. Fork the Virto Commerce repository into your account according to <a href="https://help.github.com/articles/fork-a-repo/">GitHub Fork a Repo</a> document.
3. Make your changes. Use `dev` branch because it contains the latest stable code. We also recommend you test your code before contributing.
4. Once ready to commit your changes, create a pull request to `dev` branch according to <a href="https://help.github.com/articles/creating-a-pull-request/">GitHub Create a Pull Request</a>.
5. Once received, the Virto Commerce development team will review your contribution and if approved, will pull your request to the appropriate branch.
4 changes: 2 additions & 2 deletions CommonAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
[assembly: AssemblyProduct("VirtoCommerce Subscription Module")]
[assembly: AssemblyCopyright("Copyright © VirtoCommerce 2011-2017")]

[assembly: AssemblyFileVersion("1.0.4.0")]
[assembly: AssemblyVersion("1.0.4.0")]
[assembly: AssemblyFileVersion("1.0.5.0")]
[assembly: AssemblyVersion("1.0.5.0")]

#if DEBUG

Expand Down
12 changes: 12 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Copyright (c) Virto Solutions LTD.  All rights reserved.

Licensed under the Virto Commerce Open Software License (the "License"); you
may not use this file except in compliance with the License. You may
obtain a copy of the License at

https://virtocommerce.com/open-source-license

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
20 changes: 20 additions & 0 deletions NuGet/build.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
SET "SOURCE_DIR=%~dp0%.."
SET "TARGET_DIR=%SOURCE_DIR%\NuGet"

IF NOT DEFINED ProgramFiles(x86) SET ProgramFiles(x86)=%ProgramFiles%
IF NOT DEFINED MSBUILD_PATH IF EXIST "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (
FOR /f "usebackq tokens=*" %%i IN (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) DO (
IF EXIST "%%i\MSBuild\15.0\Bin\MSBuild.exe" (
SET "MSBUILD_PATH=%%i\MSBuild\15.0\Bin\MSBuild.exe"
)
)
)
IF NOT DEFINED MSBUILD_PATH IF EXIST "%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" SET MSBUILD_PATH=%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe
IF NOT DEFINED MSBUILD_PATH IF EXIST "%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe" SET MSBUILD_PATH=%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe
IF NOT DEFINED MSBUILD_PATH SET MSBUILD_PATH=%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe

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

nuget pack "%SOURCE_DIR%\VirtoCommerce.SubscriptionModule.Data\VirtoCommerce.SubscriptionModule.Data.csproj" -IncludeReferencedProjects -Symbols -Properties Configuration=Release -o "%TARGET_DIR%"
nuget pack "%SOURCE_DIR%\VirtoCommerce.SubscriptionModule.Core\VirtoCommerce.SubscriptionModule.Core.csproj" -IncludeReferencedProjects -Symbols -Properties Configuration=Release -o "%TARGET_DIR%"
@pause
Binary file added NuGet/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions NuGet/publish.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
@echo off
setlocal enabledelayedexpansion

if "%1" equ "" (
echo Pass NuGet API key as first parameter
pause
exit /b 1
)

for %%f in (*.nupkg) do (
set fileName=%%~nf
if "!fileName!" equ "!fileName:.symbols=!" (
nuget push %%f -Source nuget.org -ApiKey %1
)
)

pause
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,11 @@
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="VirtoCommerce.Domain, Version=2.20.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Domain.2.20.0\lib\net451\VirtoCommerce.Domain.dll</HintPath>
<Private>True</Private>
<Reference Include="VirtoCommerce.Domain, Version=2.24.19.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Domain.2.24.20\lib\net461\VirtoCommerce.Domain.dll</HintPath>
</Reference>
<Reference Include="VirtoCommerce.Platform.Core, Version=2.12.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Platform.Core.2.12.6\lib\net461\VirtoCommerce.Platform.Core.dll</HintPath>
<Private>True</Private>
<Reference Include="VirtoCommerce.Platform.Core, Version=2.13.19.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Platform.Core.2.13.19\lib\net461\VirtoCommerce.Platform.Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0"?>
<package>
<metadata>
<id>$id$</id>
<version>1.0.5</version>
<title>$title$</title>
<authors>VirtoCommerce</authors>
<owners>VirtoCommerce</owners>
<licenseUrl>https://github.com/VirtoCommerce/vc-module-subscription/raw/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/VirtoCommerce/vc-module-subscription</projectUrl>
<iconUrl>https://github.com/VirtoCommerce/vc-module-subscription/raw/master/NuGet/icon.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Subscriptions implementation</description>
<copyright>Copyright © VirtoCommerce 2011-2017</copyright>
</metadata>
</package>
4 changes: 2 additions & 2 deletions VirtoCommerce.SubscriptionModule.Core/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="Newtonsoft.Json" version="9.0.1" targetFramework="net451" />
<package id="VirtoCommerce.Domain" version="2.20.0" targetFramework="net461" />
<package id="VirtoCommerce.Platform.Core" version="2.12.6" targetFramework="net461" />
<package id="VirtoCommerce.Domain" version="2.24.20" targetFramework="net461" />
<package id="VirtoCommerce.Platform.Core" version="2.13.19" targetFramework="net461" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,14 @@
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="VirtoCommerce.Domain, Version=2.20.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Domain.2.20.0\lib\net451\VirtoCommerce.Domain.dll</HintPath>
<Private>True</Private>
<Reference Include="VirtoCommerce.Domain, Version=2.24.19.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Domain.2.24.20\lib\net461\VirtoCommerce.Domain.dll</HintPath>
</Reference>
<Reference Include="VirtoCommerce.Platform.Core, Version=2.12.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Platform.Core.2.12.6\lib\net461\VirtoCommerce.Platform.Core.dll</HintPath>
<Private>True</Private>
<Reference Include="VirtoCommerce.Platform.Core, Version=2.13.19.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Platform.Core.2.13.19\lib\net461\VirtoCommerce.Platform.Core.dll</HintPath>
</Reference>
<Reference Include="VirtoCommerce.Platform.Data, Version=2.12.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Platform.Data.2.12.5\lib\net461\VirtoCommerce.Platform.Data.dll</HintPath>
<Private>True</Private>
<Reference Include="VirtoCommerce.Platform.Data, Version=2.13.19.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Platform.Data.2.13.19\lib\net461\VirtoCommerce.Platform.Data.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0"?>
<package>
<metadata>
<id>$id$</id>
<version>1.0.5</version>
<title>$title$</title>
<authors>VirtoCommerce</authors>
<owners>VirtoCommerce</owners>
<licenseUrl>https://github.com/VirtoCommerce/vc-module-subscription/raw/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/VirtoCommerce/vc-module-subscription</projectUrl>
<iconUrl>https://github.com/VirtoCommerce/vc-module-subscription/raw/master/NuGet/icon.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Subscriptions implementation</description>
<copyright>Copyright © VirtoCommerce 2011-2017</copyright>
</metadata>
</package>
6 changes: 3 additions & 3 deletions VirtoCommerce.SubscriptionModule.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.3" targetFramework="net461" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net451" />
<package id="valueinjecter" version="2.3.3" targetFramework="net451" />
<package id="VirtoCommerce.Domain" version="2.20.0" targetFramework="net461" />
<package id="VirtoCommerce.Platform.Core" version="2.12.6" targetFramework="net461" />
<package id="VirtoCommerce.Platform.Data" version="2.12.5" targetFramework="net461" />
<package id="VirtoCommerce.Domain" version="2.24.20" targetFramework="net461" />
<package id="VirtoCommerce.Platform.Core" version="2.13.19" targetFramework="net461" />
<package id="VirtoCommerce.Platform.Data" version="2.13.19" targetFramework="net461" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
<Use64BitIISExpress />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -119,21 +120,17 @@
<Reference Include="System.Web.Services" />
<Reference Include="System.EnterpriseServices" />
<Reference Include="System.Xml.Linq" />
<Reference Include="VirtoCommerce.Domain, Version=2.20.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Domain.2.20.0\lib\net451\VirtoCommerce.Domain.dll</HintPath>
<Private>True</Private>
<Reference Include="VirtoCommerce.Domain, Version=2.24.19.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Domain.2.24.20\lib\net461\VirtoCommerce.Domain.dll</HintPath>
</Reference>
<Reference Include="VirtoCommerce.Platform.Core, Version=2.12.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Platform.Core.2.12.6\lib\net461\VirtoCommerce.Platform.Core.dll</HintPath>
<Private>True</Private>
<Reference Include="VirtoCommerce.Platform.Core, Version=2.13.19.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Platform.Core.2.13.19\lib\net461\VirtoCommerce.Platform.Core.dll</HintPath>
</Reference>
<Reference Include="VirtoCommerce.Platform.Core.Web, Version=2.12.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Platform.Core.Web.2.12.5\lib\net461\VirtoCommerce.Platform.Core.Web.dll</HintPath>
<Private>True</Private>
<Reference Include="VirtoCommerce.Platform.Core.Web, Version=2.13.19.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Platform.Core.Web.2.13.19\lib\net461\VirtoCommerce.Platform.Core.Web.dll</HintPath>
</Reference>
<Reference Include="VirtoCommerce.Platform.Data, Version=2.12.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Platform.Data.2.12.5\lib\net461\VirtoCommerce.Platform.Data.dll</HintPath>
<Private>True</Private>
<Reference Include="VirtoCommerce.Platform.Data, Version=2.13.19.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\VirtoCommerce.Platform.Data.2.13.19\lib\net461\VirtoCommerce.Platform.Data.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -227,13 +224,15 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="..\packages\VirtoCommerce.Module.0.10.0\build\VirtoCommerce.Module.targets" Condition="Exists('..\packages\VirtoCommerce.Module.0.10.0\build\VirtoCommerce.Module.targets')" />
<Import Project="..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets" Condition="Exists('..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.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.10.0\build\VirtoCommerce.Module.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\VirtoCommerce.Module.0.10.0\build\VirtoCommerce.Module.targets'))" />
<Error Condition="!Exists('..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets'))" />
<Error Condition="!Exists('..\packages\VirtoCommerce.Module.0.17.0\build\VirtoCommerce.Module.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\VirtoCommerce.Module.0.17.0\build\VirtoCommerce.Module.targets'))" />
</Target>
<Import Project="..\packages\VirtoCommerce.Module.0.17.0\build\VirtoCommerce.Module.targets" Condition="Exists('..\packages\VirtoCommerce.Module.0.17.0\build\VirtoCommerce.Module.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">
Expand Down
8 changes: 4 additions & 4 deletions VirtoCommerce.SubscriptionModule.Web/module.manifest
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" ?>
<module>
<id>VirtoCommerce.Subscription</id>
<version>1.0.4</version>
<platformVersion>2.12.4</platformVersion>
<version>1.0.5</version>
<platformVersion>2.13.19</platformVersion>
<dependencies>
<dependency id="VirtoCommerce.Core" version="2.20.0" />
<dependency id="VirtoCommerce.Core" version="2.24.20" />
<dependency id="VirtoCommerce.Orders" version="2.15.0" />
<dependency id="VirtoCommerce.Store" version="2.11.0" />
</dependencies>
Expand All @@ -20,7 +20,7 @@
</owners>
<projectUrl>https://github.com/VirtoCommerce/vc-module-subscription</projectUrl>
<iconUrl>https://raw.githubusercontent.com/VirtoCommerce/vc-module-subscription/master/VirtoCommerce.SubscriptionModule.Web/Content/logo.png</iconUrl>
<copyright>Copyright © 2016 Virto Commerce. All rights reserved</copyright>
<copyright>Copyright © 2017 Virto Commerce. All rights reserved</copyright>
<tags>subscriptions system</tags>

<assemblyFile>VirtoCommerce.SubscriptionModule.Web.dll</assemblyFile>
Expand Down
11 changes: 6 additions & 5 deletions VirtoCommerce.SubscriptionModule.Web/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
<package id="Hangfire.Core" version="1.6.6" targetFramework="net461" />
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net451" />
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net451" />
<package id="MSBuildTasks" version="1.5.0.235" targetFramework="net461" developmentDependency="true" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net451" />
<package id="Owin" version="1.0" targetFramework="net461" />
<package id="Unity" version="4.0.1" targetFramework="net451" />
<package id="valueinjecter" version="2.3.3" targetFramework="net451" />
<package id="VirtoCommerce.Domain" version="2.20.0" targetFramework="net461" />
<package id="VirtoCommerce.Module" version="0.10.0" targetFramework="net461" developmentDependency="true" />
<package id="VirtoCommerce.Platform.Core" version="2.12.6" targetFramework="net461" />
<package id="VirtoCommerce.Platform.Core.Web" version="2.12.5" targetFramework="net461" />
<package id="VirtoCommerce.Platform.Data" version="2.12.5" targetFramework="net461" />
<package id="VirtoCommerce.Domain" version="2.24.20" targetFramework="net461" />
<package id="VirtoCommerce.Module" version="0.17.0" targetFramework="net461" developmentDependency="true" />
<package id="VirtoCommerce.Platform.Core" version="2.13.19" targetFramework="net461" />
<package id="VirtoCommerce.Platform.Core.Web" version="2.13.19" targetFramework="net461" />
<package id="VirtoCommerce.Platform.Data" version="2.13.19" targetFramework="net461" />
</packages>

0 comments on commit 5d45fcd

Please sign in to comment.