Merge branch 'develop'

# Conflicts:
#	.github/workflows/build.yml

.github/workflows/build.yml

@@ -4,10 +4,10 @@ on:
   workflow_dispatch:
   push:
     branches:    
-      - 'release/4.0'
+      - 'release/4.0.0'
   pull_request:
     branches:
-      - 'release/4.0'
+      - 'release/4.0.0'
 
 jobs:
   build:
@@ -59,9 +59,9 @@ jobs:
         name: smidge-test-results
         path:  ${{ github.workspace }}/_TestResults/tests.trx
 
+    # This will do a rebuild
     - name: Pack
-      if: success()
-      # This will do a rebuild
+      if: success()      
       run: |
         dotnet pack ${{ env.Solution_File }} \
           --configuration ${{ env.Configuration }} \
@@ -75,7 +75,7 @@ jobs:
           --output=${{ github.workspace }}/_NugetOutput
 
     - uses: actions/upload-artifact@v2  # upload nuget
-      if: success()
+      if: ${{ success() }}
       with:
         name: smidge-nuget-${{ env.GitVersion_SemVer }}
         path:  ${{ github.workspace }}/_NugetOutput/*.*

.github/workflows/test-report.yml

@@ -1,7 +1,7 @@
 name: 'Test Report'
 on:
   workflow_run:
-    workflows: ['Examine Build']                     # runs after CI workflow
+    workflows: ['Smidge Build']                     # runs after CI workflow
     types:
       - completed
 jobs:
@@ -10,7 +10,7 @@ jobs:
     steps:
     - uses: dorny/test-reporter@v1.4.2
       with:
-        artifact: examine-test-results    # artifact name
+        artifact: smidge-test-results    # artifact name
         name: Publish Tests               # Name of the check run which will be created
         path: '*.trx'                     # Path to test results (inside artifact .zip)
         reporter: dotnet-trx              # Format of test results

GitVersion.yml

@@ -0,0 +1,32 @@
+next-version: 1.0
+assembly-versioning-scheme: MajorMinorPatch
+assembly-file-versioning-scheme: MajorMinorPatchTag
+assembly-informational-format: '{InformationalVersion}'
+mode: ContinuousDelivery
+increment: Inherit
+continuous-delivery-fallback-tag: ci
+tag-prefix: '[vV]|release-[vV]'
+major-version-bump-message: '\+semver:\s?(breaking|major)'
+minor-version-bump-message: '\+semver:\s?(feature|minor)'
+patch-version-bump-message: '\+semver:\s?(fix|patch)'
+no-bump-message: '\+semver:\s?(none|skip)'
+legacy-semver-padding: 4
+build-metadata-padding: 4
+commits-since-version-source-padding: 4
+commit-message-incrementing: Enabled
+commit-date-format: 'yyyy-MM-dd'
+ignore:
+  sha: []
+  commits-before: 2020-12-21T00:00:00
+merge-message-formats: {}
+branches:
+  main:
+    regex: ^master(\-0\.x)?$|^main(\-0\.x)?$
+    source-branches: []
+  develop:
+    regex: ^dev(elop)?(ment)?(\-0\.x)?$
+    source-branches:
+    - main
+  release:
+    mode: ContinuousDeployment
+    source-branches: ['develop']

README.md

@@ -1,5 +1,5 @@
-[![Build status](https://ci.appveyor.com/api/projects/status/y2c08r2wsqsliq7o?svg=true)](https://ci.appveyor.com/project/Shandem/smidge)
-![CI](https://github.com/Shazwazza/Smidge/workflows/CI/badge.svg)
+[![CI](https://github.com/Shazwazza/Smidge/actions/workflows/ci.yml/badge.svg)](https://github.com/Shazwazza/Smidge/actions/workflows/ci.yml)
+[![Smidge Build](https://github.com/Shazwazza/Smidge/actions/workflows/build.yml/badge.svg)](https://github.com/Shazwazza/Smidge/actions/workflows/build.yml)
 
 ![Smidge](assets/logosmall.png?raw=true) Smidge
 ======
@@ -74,7 +74,7 @@ services.UseSmidge(bundles =>
 {
    //Defining using file/folder paths:
    
-   bundles.CreateJs("test-bundle-2", "~/Js/Bundle2", "~/Js/OtherFolder*js");
+   bundles.CreateJs("test-bundle-2", "~/Js/Bundle2", "~/Js/OtherFolder/*.js");
 
    //Or defining using JavaScriptFile's or CssFile's
    //this allows you to custom the pipeline per file

Smidge.sln

@@ -9,16 +9,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{46C13455-6
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{92DBA67A-D9B9-4867-9519-DD846F47ED5C}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
 		.gitignore = .gitignore
-		appveyor.build.yml = appveyor.build.yml
-		appveyor.yml = appveyor.yml
-		build.ps1 = build.ps1
-		build.xml = build.xml
-		.github\workflows\ci.yml = .github\workflows\ci.yml
+		.github\workflows\build.yml = .github\workflows\build.yml
+		src\Directory.Build.props = src\Directory.Build.props
+		GitVersion.yml = GitVersion.yml
 		LICENSE = LICENSE
 		Nuget.config = Nuget.config
 		README.md = README.md
-		tests.ps1 = tests.ps1
+		.github\workflows\test-report.yml = .github\workflows\test-report.yml
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Smidge", "src\Smidge\Smidge.csproj", "{C304B5B8-0750-4B60-B6D0-06208639D560}"
@@ -31,6 +30,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Smidge.Nuglify", "src\Smidg
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Smidge.Benchmarks", "test\Smidge.Benchmarks\Smidge.Benchmarks.csproj", "{8AA76B60-A92C-41C8-A045-06433E33C40C}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Smidge.InMemory", "src\Smidge.InMemory\Smidge.InMemory.csproj", "{96EF3FF6-BD73-4495-B9C7-2A6C1C7B50CF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Smidge.Core", "src\Smidge.Core\Smidge.Core.csproj", "{B19C5049-69BA-4581-918F-6C2B4961E326}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -57,6 +60,14 @@ Global
 		{8AA76B60-A92C-41C8-A045-06433E33C40C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8AA76B60-A92C-41C8-A045-06433E33C40C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8AA76B60-A92C-41C8-A045-06433E33C40C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96EF3FF6-BD73-4495-B9C7-2A6C1C7B50CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96EF3FF6-BD73-4495-B9C7-2A6C1C7B50CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96EF3FF6-BD73-4495-B9C7-2A6C1C7B50CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96EF3FF6-BD73-4495-B9C7-2A6C1C7B50CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B19C5049-69BA-4581-918F-6C2B4961E326}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B19C5049-69BA-4581-918F-6C2B4961E326}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B19C5049-69BA-4581-918F-6C2B4961E326}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B19C5049-69BA-4581-918F-6C2B4961E326}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -67,6 +78,8 @@ Global
 		{89D8D7E5-4145-4A7E-A41A-EEDCB5FA7AE7} = {A5154E3B-762A-4720-A947-C7A3EA25835A}
 		{8CBB999A-D071-4B95-B973-E1ECB8661333} = {A5154E3B-762A-4720-A947-C7A3EA25835A}
 		{8AA76B60-A92C-41C8-A045-06433E33C40C} = {46C13455-622B-44B6-A129-F96EADAD24C8}
+		{96EF3FF6-BD73-4495-B9C7-2A6C1C7B50CF} = {A5154E3B-762A-4720-A947-C7A3EA25835A}
+		{B19C5049-69BA-4581-918F-6C2B4961E326} = {A5154E3B-762A-4720-A947-C7A3EA25835A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A0EB5714-BE56-4F17-B40A-8E8FADFDF503}

src/Directory.Build.props

@@ -0,0 +1,28 @@
+<Project>
+
+  <PropertyGroup>
+    <!-- These are Source link props -->    
+    <PublishRepositoryUrl>https://github.com/Shazwazza/Smidge</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <LangVersion>9.0</LangVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+  </ItemGroup>
+  <PropertyGroup>
+    <PackageProjectUrl>https://github.com/Shazwazza/Smidge</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/Shazwazza/Smidge</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <Copyright>$(Copyright)</Copyright>
+    <Company>Shannon Deminick</Company>
+    <Authors>shandem</Authors>
+    <PackageIcon>logo-nuget.png</PackageIcon>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <VersionPrefix>4.0.0</VersionPrefix>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+  </PropertyGroup>
+</Project>