Merge branch 'Shazwazza/master' into dnn

# Conflicts: # appveyor.yml
dnnsoftware · Aug 11, 2021 · 8123ec7 · 8123ec7
2 parents 133fe7c + 21f1509
commit 8123ec7
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/appveyor.build.yml b/appveyor.build.yml
@@ -1,4 +1,4 @@
-version: 1.9.8.{build}
+version: 1.9.10.{build}
 skip_tags: true
 image: Visual Studio 2019
 build_script:

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,16 +1,17 @@
+version: 1.9.10.{build}
+skip_non_tags: true
+image: Visual Studio 2019
 pull_requests:
   do_not_increment_build_number: true
 branches:
   only:
   - dnn
-image: Visual Studio 2017
 nuget:
   project_feed: true
   disable_publish_on_pr: true
-version: 1.9.2.{build}
 
 environment:
-  ProductVersion: 1.9.2
+  ProductVersion: 1.9.10
 
 before_build:
 - ps: Update-AppveyorBuild -Version "$env:ProductVersion.$env:APPVEYOR_BUILD_NUMBER-$env:APPVEYOR_JOB_ID"
@@ -19,3 +20,6 @@ build_script:
 - ps: .\Build-Release.ps1 $env:BuildVersion ''
 after_build:
 - ps: Push-AppveyorArtifact build\Releases\v$env:BuildVersion\Dnn.ClientDependency.$env:BuildVersion.nupkg
+artifacts:
+- path: build\Release\*.nupkg
+  name: Nuget Package
diff --git a/src/ClientDependency.Core/CssHelper.cs b/src/ClientDependency.Core/CssHelper.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Web;
+using System.Web;   
 using ClientDependency.Core.CompositeFiles;
 using ClientDependency.Core.Config;
 

diff --git a/src/ClientDependency.Web.Test/Web.config b/src/ClientDependency.Web.Test/Web.config
@@ -26,7 +26,7 @@ Composite files are used for both types of projects.
 
 ** IMPORTANT: If you're web.config setting: compilation debug="true" is set to 'true', then composite files will NOT be enabled no matter what
 -->
-  <clientDependency htmlCompatibility="html5" version="44789" fileDependencyExtensions=".js,.css" loggerType="ClientDependency.Web.Test.TestLogger, ClientDependency.Web.Test">
+  <clientDependency htmlCompatibility="html5" version="849465" fileDependencyExtensions=".js,.css" loggerType="ClientDependency.Web.Test.TestLogger, ClientDependency.Web.Test">
     <!--The enableCompositeFiles="true" is optional and by default is set to true.-->
     <!-- 
     This section is used for Web Forms only.    

diff --git a/src/ClientDependency.sln b/src/ClientDependency.sln
@@ -11,8 +11,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{C5D95718-11A7-4F12-A41A-10229A87F428}"
 	ProjectSection(SolutionItems) = preProject
-		appveyor.build.yml = appveyor.build.yml
-		appveyor.yml = appveyor.yml
+		..\appveyor.build.yml = ..\appveyor.build.yml
+		..\appveyor.yml = ..\appveyor.yml
 		..\Build-Release.ps1 = ..\Build-Release.ps1
 		..\build\ClientDependency-Coffee.nuspec = ..\build\ClientDependency-Coffee.nuspec
 		..\build\ClientDependency-Less.nuspec = ..\build\ClientDependency-Less.nuspec

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
@@ -2,11 +2,11 @@
 using System.Security;
 
 [assembly: AssemblyCompany("Shannon Deminick")]
-[assembly: AssemblyCopyright("Copyright © Shannon Deminick 2020")]
+[assembly: AssemblyCopyright("Copyright © Shannon Deminick 2021")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyCulture("")] 
 
 
-[assembly: AssemblyVersion("1.9.9")]
-[assembly: AssemblyFileVersion("1.9.9")]
-[assembly: AssemblyInformationalVersion("1.9.9")]
+[assembly: AssemblyVersion("1.9.10")]
+[assembly: AssemblyFileVersion("1.9.10")]
+[assembly: AssemblyInformationalVersion("1.9.10")]