Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 03.05.00 #337

Merged
merged 82 commits into from
Oct 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
06d26ba
Merge branch 'Issues/Issue-269' into development
Jun 4, 2020
c6b6b53
Merge branch 'Issues/Issue#288' into development
Jun 4, 2020
d406a2c
Merge remote-tracking branch 'upstream/development' into development
Jun 5, 2020
506cf6b
Only show available products @sitemap
Jun 5, 2020
bdc8d60
Merge branch 'master' into development
Jun 12, 2020
1c8a114
Revert "Only show available products @sitemap"
Jun 12, 2020
5a0ea66
Merge branch 'master' into development
Jun 12, 2020
d767231
Basic solution for this enhancement - needs refining and polishing
Jun 25, 2020
706ba4e
Changed Checkout.js to default-Legacy to match dev.env - Reset on inv…
Jun 26, 2020
5f0849e
Localized validation msg
Jun 29, 2020
52bf020
Provide Sitemap-URLs of active products only
Jul 1, 2020
5fa3a90
All Controllers: changed every occurrence of Response.Redirect to Red…
Jul 6, 2020
e3d9509
Adding support for submit type button elements to forms
bubish Jul 23, 2020
8c6608a
Closes #313
WillStrohl Sep 17, 2020
107bf9e
data source update
WillStrohl Sep 17, 2020
f133bbf
Merge pull request #314 from hismightiness/issues/issue-313
Sep 17, 2020
d922141
Updated .NET to 4.7.2 & DNN to 9.4.4
WillStrohl Sep 20, 2020
dd69f1b
Resolving build issues
WillStrohl Sep 20, 2020
75be287
Initial addition of Prompt
WillStrohl Sep 20, 2020
ac7bdb9
Moved localization to base class
WillStrohl Sep 20, 2020
248485a
Added HCC branding to messages
WillStrohl Sep 21, 2020
e54776a
Added sales summary prompt
WillStrohl Sep 21, 2020
b8190d4
Added a clear cache prompt
WillStrohl Sep 21, 2020
9e6910d
Prevent a conflict with built-in prompt command
WillStrohl Oct 4, 2020
76385df
Localized prompt descriptions
WillStrohl Oct 4, 2020
b745863
Added logging to DNN user creation tasks
WillStrohl Oct 4, 2020
f05c607
Added a flag to sales-summary
WillStrohl Oct 4, 2020
2ac970e
Fixed bug in Viewsets
sniravj Oct 9, 2020
bc78bfd
Adds more logging to the DNN Membership workflow task
WillStrohl Oct 12, 2020
c7d1dda
Placeholder content for help for prompt commands
WillStrohl Oct 12, 2020
e483211
Merge pull request #304 from Navilois/Enhancements/#155-EU-B2B-rules
Oct 12, 2020
3bae71f
Merge PR #304 updates to the DevSamples
WillStrohl Oct 12, 2020
30e9d5a
Merged PR #304 missing updates to the other viewsets
WillStrohl Oct 12, 2020
de896d6
Merge pull request #319 from hismightiness/issues/resolve-issues-pr-304
Oct 12, 2020
670590c
Merge pull request #306 from Navilois/Issues/Issue#305
Oct 12, 2020
dd2c60b
Merge pull request #307 from Navilois/Issues/Issue#219
Oct 12, 2020
6816a80
Merge remote-tracking branch 'upstream/development' into tasks/add-pr…
WillStrohl Oct 12, 2020
5e37f89
Fix in SQL
sniravj Oct 21, 2020
0ed2f3b
Merge pull request #317 from HotcakesCommerce/Bugs/ViewsetUpdates
Oct 21, 2020
023ca96
Fixed folder structure for DevSamples viewsets
WillStrohl Oct 22, 2020
d59f8b5
Resolves #322
WillStrohl Oct 22, 2020
f02a23d
Merge pull request #324 from hismightiness/issues/issue-322
Oct 22, 2020
d08f204
Merge pull request #309 from bubish/master
Oct 22, 2020
7b05934
Alphabetized the properties
WillStrohl Oct 22, 2020
708d686
Resolves #311
WillStrohl Oct 22, 2020
4627bbb
Merge pull request #325 from hismightiness/issues/issue-311
Oct 22, 2020
77ced45
Merge remote-tracking branch 'upstream/master' into development
WillStrohl Oct 22, 2020
c5af683
Resolved domain name typos
WillStrohl Oct 22, 2020
107b8c2
Updated the version for packaging
WillStrohl Oct 22, 2020
1b373e5
Updated release notes for packaging
WillStrohl Oct 22, 2020
c1e3ab3
Fix in Provider Script
sniravj Oct 23, 2020
0b2c5d0
Resolves build issues
WillStrohl Oct 23, 2020
255c13c
Resolves build issues
WillStrohl Oct 23, 2020
7671b6c
Merge pull request #327 from hismightiness/tasks/add-prompt
Oct 23, 2020
396bd08
More Fix in Store Settings SQL script
sniravj Oct 23, 2020
1f908c6
Updated release notes
WillStrohl Oct 23, 2020
77471a5
Preventing file locks during build
WillStrohl Oct 23, 2020
b67b5ca
Moved new store settings logic from SQL to IUpgradeable
WillStrohl Oct 23, 2020
701234f
Merge branch 'development' into tasks/release-tasks
Oct 23, 2020
80fa9d1
Merge pull request #328 from hismightiness/tasks/release-tasks
Oct 23, 2020
d274fc6
Resolves issue with incorrect key store setting on upgrade
WillStrohl Oct 23, 2020
20d1f07
Merge pull request #329 from hismightiness/issues/testing-fixes
Oct 23, 2020
db54a9c
Replaced interpolation with string.Format for now
WillStrohl Oct 23, 2020
24eb6de
Bug fix for JS issue in viewset
sniravj Oct 23, 2020
7a97354
Merge branch 'development' into Bugs/ViewsetUpdates
sniravj Oct 23, 2020
0753dcc
Fixed issue in JS for emails
sniravj Oct 23, 2020
fff9be7
Merge 'origin/development' into Bugs/LoginIssueFix
sniravj Oct 23, 2020
039ab90
Merge pull request #330 from HotcakesCommerce/Bugs/LoginIssueFix
Oct 23, 2020
4671702
Merged viewset changes
WillStrohl Oct 23, 2020
16b9bab
Merge pull request #331 from hismightiness/tasks/merge-viewset-changes
Oct 23, 2020
5a49315
more bug fix in JS for viewsets
sniravj Oct 23, 2020
ecdb55a
Merge branch 'origin/development' into Bugs/ViewsetUpdates
sniravj Oct 23, 2020
b4b413b
Merge pull request #326 from HotcakesCommerce/Bugs/ViewsetUpdates
Oct 23, 2020
2557c04
Removed deprecated licensing DLL reference
WillStrohl Oct 23, 2020
f5f06fb
Was supposed to be building against DNN 9.2.2 not 9.4.4
WillStrohl Oct 23, 2020
0afb81b
Formally removing HCC licensing on upgrade
WillStrohl Oct 23, 2020
ac7a8a2
Merge pull request #334 from hismightiness/tasks/resolve-build-issues
Oct 23, 2020
2578742
Updating DevSamples references
WillStrohl Oct 23, 2020
fad290b
Merge pull request #335 from hismightiness/tasks/updating-devsamples-…
Oct 23, 2020
99fa94e
Removed unnecessary PDB
WillStrohl Oct 23, 2020
d0d31e4
Resolved final build issues in DevSamples
WillStrohl Oct 23, 2020
6bc5646
Merge pull request #336 from hismightiness/tasks/final-build-issue
Oct 23, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion .build/ModulePackage.targets
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@
<!-- Copy file to Modules Build Folder -->
<Copy SourceFiles="@(HotcakesDlls)" DestinationFolder="$(ModulesBuildFolder)\bin" />
<Copy SourceFiles="$(MSBuildDnnBinPath)\Hotcakes.Common.Dnn.dll" DestinationFolder="$(ModulesBuildFolder)\bin" />
<Copy SourceFiles="$(MSBuildDnnBinPath)\Hotcakes.Licensing.Common.dll" DestinationFolder="$(ModulesBuildFolder)\bin" />
<Copy SourceFiles="$(MSBuildDnnBinPath)\Hotcakes.Shipping.FedEx.XmlSerializers.dll" DestinationFolder="$(ModulesBuildFolder)\bin" />
<Copy SourceFiles="$(MSBuildDnnBinPath)\Avalara.AvaTax.Adapter.dll" DestinationFolder="$(ModulesBuildFolder)\bin" />
<!-- thought log4net is not used by our code directly, it have to be present since it is used by paypal_base.dll -->
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ _UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
[Uu]pgrade[Ll]og.htm
*.bak

############
## CMS
Expand Down
4 changes: 2 additions & 2 deletions Build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@

<!-- Version Number -->
<PropertyGroup Condition=" '$(BUILD_NUMBER)' == '' ">
<Version>03.04.01</Version>
<Version>03.05.00</Version>
<FileVersion>01.00.00</FileVersion>
<InformationalVersion>01.00.00</InformationalVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(BUILD_NUMBER)' != '' ">
<!-- Build Server Number -->
<Version>03.04.01</Version>
<Version>03.05.00</Version>
<FileVersion>$(BUILD_NUMBER)</FileVersion>
<InformationalVersion>$(BUILD_NUMBER)</InformationalVersion>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion DevSamples/ApiSample/ApiSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ApiSample</RootNamespace>
<AssemblyName>ApiSample</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down
20 changes: 17 additions & 3 deletions DevSamples/AuthorizeNetEmulator/AuthorizeNetEmulator.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props" Condition="Exists('..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -13,7 +14,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AuthorizeNetEmulator</RootNamespace>
<AssemblyName>AuthorizeNetEmulator</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<UseIISExpress>true</UseIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
Expand All @@ -22,6 +23,8 @@
<TargetFrameworkProfile />
<Use64BitIISExpress />
<UseGlobalApplicationHostFile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -96,13 +99,16 @@
<ItemGroup>
<Content Include="DesktopModules\Hotcakes\Core\Admin\Parts\CreditCardGateways\Authorize.Net Emulator\App_LocalResources\Edit.ascx.resx" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
Expand All @@ -112,6 +118,14 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<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\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\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props'))" />
</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">
Expand Down
5 changes: 5 additions & 0 deletions DevSamples/AuthorizeNetEmulator/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MSBuild.Microsoft.VisualStudio.Web.targets" version="14.0.0.3" targetFramework="net451" />
<package id="MSBuildTasks" version="1.5.0.235" targetFramework="net451" developmentDependency="true" />
</packages>
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props" Condition="Exists('..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -13,7 +14,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyCompany.MyCreditCardGateway</RootNamespace>
<AssemblyName>MyCompany.MyCreditCardGateway</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<UseIISExpress>true</UseIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
Expand All @@ -22,6 +23,8 @@
<TargetFrameworkProfile />
<Use64BitIISExpress />
<UseGlobalApplicationHostFile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -96,13 +99,16 @@
<ItemGroup>
<Content Include="DesktopModules\Hotcakes\Core\Admin\Parts\CreditCardGateways\MyTestGateway\App_LocalResources\Edit.ascx.resx" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
Expand All @@ -112,6 +118,14 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<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\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\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props'))" />
</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">
Expand Down
5 changes: 5 additions & 0 deletions DevSamples/MyCreditCardGateway/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MSBuild.Microsoft.VisualStudio.Web.targets" version="14.0.0.3" targetFramework="net451" />
<package id="MSBuildTasks" version="1.5.0.235" targetFramework="net451" developmentDependency="true" />
</packages>
20 changes: 17 additions & 3 deletions DevSamples/MyGiftCardGateway/MyCompany.MyGiftCardGateway.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props" Condition="Exists('..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -13,7 +14,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyCompany.MyGiftCardGateway</RootNamespace>
<AssemblyName>MyCompany.MyGiftCardGateway</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<UseIISExpress>true</UseIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
Expand All @@ -22,6 +23,8 @@
<TargetFrameworkProfile />
<Use64BitIISExpress />
<UseGlobalApplicationHostFile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -96,13 +99,16 @@
<ItemGroup>
<Content Include="DesktopModules\Hotcakes\Core\Admin\Parts\GiftCardGateways\MyTestGateway\App_LocalResources\Edit.ascx.resx" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
Expand All @@ -112,6 +118,14 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<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\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\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props'))" />
</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">
Expand Down
5 changes: 5 additions & 0 deletions DevSamples/MyGiftCardGateway/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MSBuild.Microsoft.VisualStudio.Web.targets" version="14.0.0.3" targetFramework="net451" />
<package id="MSBuildTasks" version="1.5.0.235" targetFramework="net451" developmentDependency="true" />
</packages>
2 changes: 1 addition & 1 deletion DevSamples/MyIntegration/MyCompany.MyIntegration.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyCompany.MyIntegration</RootNamespace>
<AssemblyName>MyCompany.MyIntegration</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down
20 changes: 17 additions & 3 deletions DevSamples/MyPaymentMethod/MyCompany.MyPaymentMethod.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props" Condition="Exists('..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -13,7 +14,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyCompany.MyPaymentMethod</RootNamespace>
<AssemblyName>MyCompany.MyPaymentMethod</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<UseIISExpress>true</UseIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
Expand All @@ -22,6 +23,8 @@
<TargetFrameworkProfile />
<Use64BitIISExpress />
<UseGlobalApplicationHostFile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -115,13 +118,16 @@
<ItemGroup>
<Content Include="DesktopModules\Hotcakes\Core\Admin\Parts\PaymentMethods\MyPaymentMethod\App_LocalResources\Edit.ascx.resx" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
Expand All @@ -131,6 +137,14 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<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\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props'))" />
<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'))" />
</Target>
<Import Project="..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets" Condition="Exists('..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.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
5 changes: 5 additions & 0 deletions DevSamples/MyPaymentMethod/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MSBuild.Microsoft.VisualStudio.Web.targets" version="14.0.0.3" targetFramework="net451" />
<package id="MSBuildTasks" version="1.5.0.235" targetFramework="net451" developmentDependency="true" />
</packages>
Loading