Merge pull request #1 from HotcakesCommerce/master

Merge from fork

.build/ModulePackage.targets

@@ -96,6 +96,7 @@
 			<HotcakesDlls Include="$(MSBuildDnnBinPath)\Hotcakes.Shipping.dll" />
 			<HotcakesDlls Include="$(MSBuildDnnBinPath)\Hotcakes.Shipping.FedEx.dll" />
 			<HotcakesDlls Include="$(MSBuildDnnBinPath)\Hotcakes.Shipping.Ups.dll" />
+      <HotcakesDlls Include="$(MSBuildDnnBinPath)\Hotcakes.Shipping.UpsFreight.dll" />
 			<HotcakesDlls Include="$(MSBuildDnnBinPath)\Hotcakes.Shipping.USPostal.dll" />
 			<HotcakesDlls Include="$(MSBuildDnnBinPath)\Hotcakes.Web.dll" />
 			<HotcakesDlls Include="$(MSBuildDnnBinPath)\$(AssemblyName).dll" />
@@ -166,7 +167,7 @@
 			<Output TaskParameter="Include" ItemName="OutputContent" />
 		</CreateItem>
 
-		<Zip Files="@(OutputContent)" WorkingDirectory="$(ModulesBuildFolder)" ZipFileName="$(InstallFolder)\$(PackageName)_$(Version)_Install.$(Extension)" ParallelCompression="False" />
+		<Zip Files="@(OutputContent)" WorkingDirectory="$(ModulesBuildFolder)" ZipFileName="$(InstallFolder)\$(PackageName)_$(Version)_Core_Install.$(Extension)" ParallelCompression="False" />
 
 
 		<RemoveDir Directories ="$(CoreBuildFolder)" /> 
@@ -179,7 +180,7 @@
 		<CreateItem Include="$(DebugBuildFolder)\**\*.*">
 			<Output TaskParameter="Include" ItemName="DebugOutputContent" />
 		</CreateItem>
-		<Zip Files="@(DebugOutputContent)" WorkingDirectory="$(DebugBuildFolder)" ZipFileName="$(InstallFolder)\$(PackageName)_$(Version)_DebugSymbols.$(Extension)" ParallelCompression="False" />
+		<Zip Files="@(DebugOutputContent)" WorkingDirectory="$(DebugBuildFolder)" ZipFileName="$(InstallFolder)\$(PackageName)_$(Version)_Core_DebugSymbols.$(Extension)" ParallelCompression="False" />
 
 
 		<RemoveDir Directories ="$(DebugBuildFolder)" />

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+github: hismightiness  
+patreon: willstrohl  
+custom:  ["https://venmo.com/Will-Strohl","https://amzn.to/2WcD0jZ"]  

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,37 @@
+---
+name: Bug Report
+about: Create a report to help us improve
+
+---
+
+## Describe the bug
+A clear and concise description of what the bug is.
+
+## Software Versions
+- DNN:  00.00.00
+- Hotcakes:  00.00.00
+
+## To Reproduce
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+## Expected behavior
+A clear and concise description of what you expected to happen.
+
+## Actual behavior
+A clear and concise description of what happened instead.
+
+## Screenshots
+If applicable, add screenshots to help explain your problem.
+
+## Error log
+**Note: Debug DLL's**
+Please replace the current extension DLL's with the debug DLL's (if these are available with the release) and reproduce the error with the debug DLL's before pasting the error log.
+
+Paste the error log that is related to this issue.
+
+## Additional context
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature-request.md

@@ -0,0 +1,18 @@
+---
+name: Feature Request
+about: Suggest an idea for this project
+
+---
+
+## Is your feature request related to a problem?
+**Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+## Describe the solution you'd like
+A clear and concise description of what you want to happen.
+
+## Describe alternatives you've considered
+A clear and concise description of any alternative solutions or features you've considered.
+
+## Additional context
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/help-and-other-questions.md

@@ -0,0 +1,16 @@
+---
+name: Help and Other Questions
+about: Use this to ask questions that don't relate to features and bug reports
+
+---
+
+## Please summarize your question in one sentence
+
+
+## Give a more extended description
+
+
+## Steps to reproduce (if needed)
+
+
+## Other comments or remarks

.gitignore

@@ -11,6 +11,7 @@
 *.sln.docstates
 *.local.sln
 *.GhostDoc.xml
+._*.*
 
 ## Ignore VS2015/Roslyn artifacts
 *.sln.ide/
@@ -42,6 +43,7 @@
 *.dotCover
 *.ldf
 MSBuildLog.txt
+_[Bb]uild/
 
 # git merge artifacts
 *.orig
@@ -81,8 +83,7 @@ UpgradeLog*.XML
 
 # Ignore artifacts from deployed/installed site
 
-_[Ii]nstall
-_[Bb]uild
+_[Ii]nstall/
 
 *.zip.manifest
 

Build.proj

@@ -8,14 +8,14 @@
 
 	<!-- Version Number -->
 	<PropertyGroup Condition=" '$(BUILD_NUMBER)' == '' ">
-		<Version>03.01.00</Version>
+		<Version>03.02.03</Version>
 		<FileVersion>01.00.00</FileVersion>
 		<InformationalVersion>01.00.00</InformationalVersion>
 	</PropertyGroup>
 
 	<PropertyGroup Condition=" '$(BUILD_NUMBER)' != '' ">
 		<!-- Build Server Number -->
-		<Version>03.01.00</Version>
+		<Version>03.02.03</Version>
 		<FileVersion>$(BUILD_NUMBER)</FileVersion>
 		<InformationalVersion>$(BUILD_NUMBER)</InformationalVersion>
 	</PropertyGroup>

CommonAssemblyInfo.cs

@@ -5,13 +5,13 @@
 
 [assembly: AssemblyCompany("Hotcakes Commerce, LLC")]
 [assembly: AssemblyProduct("Hotcakes Commerce")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: CLSCompliant(false)]
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("3.01.00")]
+[assembly: AssemblyVersion("3.02.03")]
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]

DevSamples/ApiSample.sln

@@ -4,15 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApiSample", "ApiSample\ApiSample.csproj", "{43311DBA-1ABB-4DC3-B7B9-45FC8831BE9D}"
 EndProject
 Global
-	GlobalSection(TeamFoundationVersionControl) = preSolution
-		SccNumberOfProjects = 2
-		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
-		SccTeamFoundationServer = http://tfs12.arrowdesigns.net:8080/tfs/defaultcollection
-		SccLocalPath0 = ApiSample
-		SccProjectFilePathRelativizedFromConnection0 = ..\\
-		SccProjectUniqueName1 = ApiSample\\ApiSample.csproj
-		SccLocalPath1 = ApiSample
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU

DevSamples/ApiSample/ApiSample.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,12 +9,8 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ApiSample</RootNamespace>
     <AssemblyName>ApiSample</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

DevSamples/ApiSample/Program.cs

@@ -2,7 +2,7 @@
 
 // Distributed under the MIT License
 // ============================================================
-// Copyright (c) 2016 Hotcakes Commerce, LLC
+// Copyright (c) 2019 Hotcakes Commerce, LLC
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
 // and associated documentation files (the "Software"), to deal in the Software without restriction, 

DevSamples/AuthorizeNetEmulator.sln

@@ -4,16 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthorizeNetEmulator", "AuthorizeNetEmulator\AuthorizeNetEmulator.csproj", "{A359DD5C-FBD3-48A0-90DA-C3269B0C284A}"
 EndProject
 Global
-	GlobalSection(TeamFoundationVersionControl) = preSolution
-		SccNumberOfProjects = 1
-		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
-		SccTeamFoundationServer = http://tfs.arrowdesigns.net:8080/tfs/defaultcollection
-		SccProjectUniqueName0 = AuthorizeNetEmulator\\AuthorizeNetEmulator.csproj
-		SccProjectName0 = AuthorizeNetEmulator
-		SccAuxPath0 = http://tfs.arrowdesigns.net:8080/tfs/defaultcollection
-		SccLocalPath0 = AuthorizeNetEmulator
-		SccProvider0 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU

DevSamples/AuthorizeNetEmulator/AuthorizeNetEmulator.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,17 +13,15 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AuthorizeNetEmulator</RootNamespace>
     <AssemblyName>AuthorizeNetEmulator</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
     <TargetFrameworkProfile />
+    <Use64BitIISExpress />
+    <UseGlobalApplicationHostFile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -71,9 +69,9 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web.Services" />
@@ -95,7 +93,6 @@
     <Compile Include="DesktopModules\Hotcakes\Core\Admin\Parts\CreditCardGateways\Authorize.Net Emulator\AuthNetEmulatorSettings.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
     <Content Include="DesktopModules\Hotcakes\Core\Admin\Parts\CreditCardGateways\Authorize.Net Emulator\App_LocalResources\Edit.ascx.resx" />
   </ItemGroup>
@@ -110,16 +107,7 @@
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <UseIIS>True</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>0</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:34618/</IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+          <SaveServerSettingsInUserFile>True</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
     </VisualStudio>

DevSamples/AuthorizeNetEmulator/DesktopModules/Hotcakes/Core/Admin/Parts/CreditCardGateways/Authorize.Net Emulator/AuthNetEmulatorGateway.cs

@@ -2,7 +2,7 @@
 
 // Distributed under the MIT License
 // ============================================================
-// Copyright (c) 2016 Hotcakes Commerce, LLC
+// Copyright (c) 2019 Hotcakes Commerce, LLC
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
 // and associated documentation files (the "Software"), to deal in the Software without restriction, 

DevSamples/AuthorizeNetEmulator/DesktopModules/Hotcakes/Core/Admin/Parts/CreditCardGateways/Authorize.Net Emulator/AuthNetEmulatorSettings.cs

@@ -2,7 +2,7 @@
 
 // Distributed under the MIT License
 // ============================================================
-// Copyright (c) 2016 Hotcakes Commerce, LLC
+// Copyright (c) 2019 Hotcakes Commerce, LLC
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
 // and associated documentation files (the "Software"), to deal in the Software without restriction, 

DevSamples/AuthorizeNetEmulator/DesktopModules/Hotcakes/Core/Admin/Parts/CreditCardGateways/Authorize.Net Emulator/Edit.ascx.cs

@@ -2,7 +2,7 @@
 
 // Distributed under the MIT License
 // ============================================================
-// Copyright (c) 2016 Hotcakes Commerce, LLC
+// Copyright (c) 2019 Hotcakes Commerce, LLC
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
 // and associated documentation files (the "Software"), to deal in the Software without restriction, 

DevSamples/AuthorizeNetEmulator/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Hotcakes Commerce")]
-[assembly: AssemblyCopyright("Copyright © 2016 Hotcakes Commerce, LLC")]
+[assembly: AssemblyCopyright("Copyright © 2019 Hotcakes Commerce, LLC")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

DevSamples/Build.proj

@@ -40,7 +40,6 @@
 
   <Target Name="Build">
     <CallTarget Targets="CopyDevSamples" />
-    <CallTarget Targets="RemoveTFSBindings" />
     <CallTarget Targets="Compile" />
     <CallTarget Targets="Clean" />
     <CallTarget Targets="Package" />
@@ -60,6 +59,7 @@
       <DevSamples Remove="**\*.user" />
       <DevSamples Remove="**\*.user" />
       <DevSamples Remove="**\*.vspscc" />
+      <DevSamples Remove="**\*.bak" />
     </ItemGroup>
 
     <Attrib Files="@(DevSamples)" ReadOnly="false" />
@@ -68,27 +68,6 @@
     <Copy SourceFiles="@(DevSamples)" DestinationFolder="$(DevSamplesBuildFolder)\%(RecursiveDir)" />
   </Target>
 
-  <Target Name="RemoveTFSBindings">
-    <ItemGroup>
-      <SolutionFiles Include="$(DevSamplesBuildFolder)\*.sln" />
-    </ItemGroup>
-    <FileUpdate
-      Files="@(SolutionFiles)"
-      IgnoreCase="true"
-      Regex="^\s+GlobalSection\(TeamFoundationVersionControl\).+\n(\s*Scc.*\n)+\s+EndGlobalSection"
-      ReplacementText=" "
-      Multiline="true"
-      Singleline="false" />
-
-    <ItemGroup>
-      <ProjectFiles Include="$(DevSamplesBuildFolder)\**\*.*proj" />
-    </ItemGroup>
-    <FileUpdate
-      Files="@(ProjectFiles)"
-      Regex="&lt;Scc[A-z]+&gt;.+&lt;/Scc[A-z]+&gt;"
-      ReplacementText=" " />
-  </Target>
-
   <Target Name="Package">
     <ItemGroup>
       <ApiSample Include="$(DevSamplesBuildFolder)\ApiSample\**" />

DevSamples/MyCreditCardGateway.sln

@@ -4,15 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompany.MyCreditCardGateway", "MyCreditCardGateway\MyCompany.MyCreditCardGateway.csproj", "{A359DD5C-FBD3-48A0-90DA-C3269B0C284A}"
 EndProject
 Global
-	GlobalSection(TeamFoundationVersionControl) = preSolution
-		SccNumberOfProjects = 2
-		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
-		SccTeamFoundationServer = http://tfs12.arrowdesigns.net:8080/tfs/defaultcollection
-		SccLocalPath0 = .
-		SccProjectUniqueName1 = MyCreditCardGateway\\MyCompany.MyCreditCardGateway.csproj
-		SccProjectName1 = MyCreditCardGateway
-		SccLocalPath1 = MyCreditCardGateway
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU

DevSamples/MyCreditCardGateway/DesktopModules/Hotcakes/Core/Admin/Parts/CreditCardGateways/MyTestGateway/Edit.ascx.cs

@@ -2,7 +2,7 @@
 
 // Distributed under the MIT License
 // ============================================================
-// Copyright (c) 2016 Hotcakes Commerce, LLC
+// Copyright (c) 2019 Hotcakes Commerce, LLC
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
 // and associated documentation files (the "Software"), to deal in the Software without restriction,