Skip to content

Commit

Permalink
Release v3.30.4.0
Browse files Browse the repository at this point in the history
- Issue #213: Error message uses a non-Windows \n instead of e.g. Environment.NewLine
- Issue #211: Implementing a partial class with a circular css_import results in a recursion in CS-Script and results in a PathTooLongException
- Issue #214: The exception that is thrown when a the script compiler error occurs.
- Issue #202: Better versioning of referenced NuGet packages
- Issue #203: precompiler/context["CompilerOptions"] doesn't appear to work
- Issue #198: Changes from version 3.29 to 3.30
  • Loading branch information
lbs-contributor committed Nov 8, 2020
1 parent 94eee8e commit d7f8c20
Show file tree
Hide file tree
Showing 12 changed files with 319 additions and 211 deletions.
207 changes: 13 additions & 194 deletions Source/Build/build.cmd

Large diffs are not rendered by default.

289 changes: 289 additions & 0 deletions Source/Build/build.legacy.cmd

Large diffs are not rendered by default.

Binary file removed Source/Build/cscs.v3.5.exe
Binary file not shown.
4 changes: 2 additions & 2 deletions Source/CSSRoslynProvider/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
// Minor Version
// Build Number// Revision
//
[assembly: AssemblyVersion("3.30.3.0")]
[assembly: AssemblyFileVersion("3.30.3.0")]
[assembly: AssemblyVersion("3.30.4.0")]
[assembly: AssemblyFileVersion("3.30.4.0")]
4 changes: 2 additions & 2 deletions Source/CSScriptLibrary/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.30.3.0")]
[assembly: AssemblyFileVersion("3.30.3.0")]
[assembly: AssemblyVersion("3.30.4.0")]
[assembly: AssemblyFileVersion("3.30.4.0")]

//
// In order to sign your assembly you must specify a key to use. Refer to the
Expand Down
4 changes: 2 additions & 2 deletions Source/HelpProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ static string indent2(int indent, string text)
return text.ToConsoleLines(indent);
}

#pragma warning disable S3963 // "static" fields should be initialized inline
// #pragma warning disable S3963 // "static" fields should be initialized inline

static AppArgs()
{
Expand Down Expand Up @@ -743,7 +743,7 @@ static AppArgs()
#endregion SyntaxHelp
}

#pragma warning restore S3963 // "static" fields should be initialized inline
// #pragma warning restore S3963 // "static" fields should be initialized inline
}

internal class HelpProvider
Expand Down
4 changes: 2 additions & 2 deletions Source/NAnt.CSScript/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.30.3.0")]
[assembly: AssemblyFileVersion("3.30.3.0")]
[assembly: AssemblyVersion("3.30.4.0")]
[assembly: AssemblyFileVersion("3.30.4.0")]
2 changes: 1 addition & 1 deletion Source/NuGet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ static public string[] Resolve(string[] packages, bool suppressDownloading, stri
newPackageWasInstalled = true;
sw.Stop();
}
catch (Exception e)
catch
{
// the failed package willl be reported as missing reference anyway
}
Expand Down
4 changes: 2 additions & 2 deletions Source/cscscript/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.30.3.0")]
[assembly: AssemblyFileVersion("3.30.3.0")]
[assembly: AssemblyVersion("3.30.4.0")]
[assembly: AssemblyFileVersion("3.30.4.0")]
4 changes: 2 additions & 2 deletions Source/css_config/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.30.3.0")]
[assembly: AssemblyFileVersion("3.30.3.0")]
[assembly: AssemblyVersion("3.30.4.0")]
[assembly: AssemblyFileVersion("3.30.4.0")]
4 changes: 2 additions & 2 deletions Source/cswscript/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("3.30.3.0")]
[assembly: AssemblyFileVersion("3.30.3.0")]
[assembly: AssemblyVersion("3.30.4.0")]
[assembly: AssemblyFileVersion("3.30.4.0")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
// Microsoft .NET Framework documentation for more information on assembly signing.
Expand Down
4 changes: 2 additions & 2 deletions help.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
C# Script execution engine. Version 3.30.3.0.
C# Script execution engine. Version 3.30.4.0.
Copyright (C) 2004-2018 Oleg Shilo.

Usage: cscs <switch 1> <switch 2> <file> [params] [//x]
Expand Down Expand Up @@ -271,7 +271,7 @@ respect to the process current directory.
If for whatever reason it is preferred to always resolve path expression with respect to the parent script location you
can configure the script engine to do it with the following command:

cscs -config:set: ResolveRelativeFromParentScriptLocation = true
cscs -config:set:ResolveRelativeFromParentScriptLocation = true

Note if you use wildcard in the imported script name (e.g. *_build.cs) the directive will only import from the first
probing directory where the matching file(s) is found. Be careful with the wide wildcard as '*.cs' as they may lead to
Expand Down

0 comments on commit d7f8c20

Please sign in to comment.