diff --git a/build.cake b/build.cake index 0b40304..347f468 100644 --- a/build.cake +++ b/build.cake @@ -20,7 +20,6 @@ var configuration = Argument("configuration", "Release"); /////////////////////////////////////////////////////////////////////////////// var artifactsDir = "./artifacts"; var projectName = "DotNet.Glob"; -var globalAssemblyFile = "./src/GlobalAssemblyInfo.cs"; var projectToPackage = $"./src/{projectName}"; var repoBranchName = "master"; var benchMarksEnabled = EnvironmentVariable("BENCHMARKS") == "on"; @@ -92,20 +91,6 @@ Task("__SetAppVeyorBuildNumber") Task("__Restore") .Does(() => DotNetCoreRestore(solutionPath)); -Task("__UpdateAssemblyVersionInformation") - .WithCriteria(isContinuousIntegrationBuild) - .Does(() => -{ - GitVersion(new GitVersionSettings { - UpdateAssemblyInfo = true, - UpdateAssemblyInfoFilePath = globalAssemblyFile - }); - - Information("AssemblyVersion -> {0}", gitVersionInfo.AssemblySemVer); - Information("AssemblyFileVersion -> {0}", $"{gitVersionInfo.MajorMinorPatch}.0"); - Information("AssemblyInformationalVersion -> {0}", gitVersionInfo.InformationalVersion); -}); - Task("__Build") .Does(() => { @@ -162,12 +147,12 @@ Task("__Pack") .Does(() => { - var versionarg = "/p:PackageVersion=" + nugetVersion; + // var versionarg = "/p:PackageVersion=" + nugetVersion; var settings = new DotNetCorePackSettings { Configuration = "Release", OutputDirectory = $"{artifactsDir}", - ArgumentCustomization = args=>args.Append(versionarg) + // ArgumentCustomization = args=>args.Append(versionarg) }; DotNetCorePack($"{projectToPackage}", settings); diff --git a/src/DotNet.Glob/DotNet.Glob.csproj b/src/DotNet.Glob/DotNet.Glob.csproj index 5893c2c..dea6421 100644 --- a/src/DotNet.Glob/DotNet.Glob.csproj +++ b/src/DotNet.Glob/DotNet.Glob.csproj @@ -13,12 +13,18 @@ Darrell Tunnell <darrell.tunnell@googlemail.com> https://github.com/dazinator/DotNet.Glob/blob/master/LICENSE glob;globbing;dotnet;pattern;match - This is a hotfix release to support tilde characters (~), thanks goes to @ming4883 + New features and fixes. See README in Github Repo. DotNet.Glob - NET40 + NET40 - + + + + all + + + diff --git a/src/NuGet.Config b/src/NuGet.Config new file mode 100644 index 0000000..374a772 --- /dev/null +++ b/src/NuGet.Config @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + +