From 2fa9253d8c58cb03af6784925d68859134111005 Mon Sep 17 00:00:00 2001
From: filipw <wojcieszyn@gmail.com>
Date: Wed, 11 Nov 2020 15:19:08 +0100
Subject: [PATCH 01/22] fixed CompilationDependencyResolver for .NET 5.0

---
 .../Compilation/CompilationDependencyResolver.cs             | 5 +++--
 .../Compilation/CompilationReferencesReader.cs               | 2 +-
 .../Dotnet.Script.DependencyModel.csproj                     | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Dotnet.Script.DependencyModel/Compilation/CompilationDependencyResolver.cs b/src/Dotnet.Script.DependencyModel/Compilation/CompilationDependencyResolver.cs
index 8acf2981..3c2f2970 100644
--- a/src/Dotnet.Script.DependencyModel/Compilation/CompilationDependencyResolver.cs
+++ b/src/Dotnet.Script.DependencyModel/Compilation/CompilationDependencyResolver.cs
@@ -44,10 +44,11 @@ public IEnumerable<CompilationDependency> GetDependencies(string targetDirectory
             }
 
             // On .Net Core, we need to fetch the compilation references for framework assemblies separately.
-            if (defaultTargetFramework.StartsWith("netcoreapp3", StringComparison.InvariantCultureIgnoreCase))
+            if (defaultTargetFramework.StartsWith("netcoreapp3", StringComparison.InvariantCultureIgnoreCase) ||
+                defaultTargetFramework.StartsWith("net5", StringComparison.InvariantCultureIgnoreCase))
             {
                 var compilationreferences = _compilationReferenceReader.Read(projectFileInfo);
-                result.Add(new CompilationDependency("Microsoft.NETCore.App", "3.0", compilationreferences.Select(cr => cr.Path).ToArray(), Array.Empty<string>()));
+                result.Add(new CompilationDependency("Dotnet.Script.Default.Dependencies", "99.0", compilationreferences.Select(cr => cr.Path).ToArray(), Array.Empty<string>()));
             }
 
             return result;
diff --git a/src/Dotnet.Script.DependencyModel/Compilation/CompilationReferencesReader.cs b/src/Dotnet.Script.DependencyModel/Compilation/CompilationReferencesReader.cs
index 7a974e6b..4f0704ed 100644
--- a/src/Dotnet.Script.DependencyModel/Compilation/CompilationReferencesReader.cs
+++ b/src/Dotnet.Script.DependencyModel/Compilation/CompilationReferencesReader.cs
@@ -48,7 +48,7 @@ public IEnumerable<CompilationReference> Read(ProjectFileInfo projectFile)
             {
                 File.Delete(referencePathsFile);
             }
-            var exitCode = _commandRunner.Execute("dotnet", $"build \"{pathToCompilationProjectFile}\" /p:OutputType=Library -o {outputDirectory}", workingDirectory);
+            var exitCode = _commandRunner.Execute("dotnet", $"build \"{pathToCompilationProjectFile}\" /p:OutputType=Library -o {outputDirectory} --nologo", workingDirectory);
             if (exitCode != 0)
             {
                 throw new Exception($"Unable to read compilation dependencies for '{projectFile.Path}'. Make sure that all script files contains valid NuGet references");
diff --git a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj
index b3a3befb..20568bf4 100644
--- a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj
+++ b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj
@@ -11,7 +11,7 @@
     <RepositoryUrl>https://github.com/filipw/dotnet-script.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>script;csx;csharp;roslyn;omnisharp</PackageTags>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 

From 35e1d7ee577b0572d715291404493aec70fbdd9a Mon Sep 17 00:00:00 2001
From: filipw <wojcieszyn@gmail.com>
Date: Tue, 17 Nov 2020 10:16:25 +0100
Subject: [PATCH 02/22] updated to Roslyn 3.8.0

---
 src/Dotnet.Script.Core/Dotnet.Script.Core.csproj                | 2 +-
 .../Dotnet.Script.DependencyModel.NuGet.csproj                  | 2 +-
 src/Dotnet.Script/Dotnet.Script.csproj                          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
index 2fbca8d9..1a3c92d2 100644
--- a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
+++ b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
@@ -21,7 +21,7 @@
     <EmbeddedResource Include="**/*.template" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.8.0-5.final" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.8.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ReadLine" Version="2.0.1" />
     <PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
diff --git a/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj b/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj
index 3818c1d4..47fb7464 100644
--- a/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj
+++ b/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj
@@ -19,6 +19,6 @@
     <Compile Include="..\Dotnet.Script.DependencyModel\ProjectSystem\ScriptParserInternal.cs" Link="ScriptParserInternal.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.8.0-5.final" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.8.0" />
   </ItemGroup>
 </Project>
diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj
index 34bb80ce..1f2b2597 100644
--- a/src/Dotnet.Script/Dotnet.Script.csproj
+++ b/src/Dotnet.Script/Dotnet.Script.csproj
@@ -22,7 +22,7 @@
         <LangVersion>latest</LangVersion>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0-5.final" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" />
         <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.2.5" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.6" />
     </ItemGroup>

From 6eeb17fb0d4113c982df7da0c3f2420bbb032f59 Mon Sep 17 00:00:00 2001
From: filipw <wojcieszyn@gmail.com>
Date: Wed, 18 Nov 2020 11:29:38 +0100
Subject: [PATCH 03/22] missed version update

---
 src/Dotnet.Script.Core/ScriptPublisher.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Dotnet.Script.Core/ScriptPublisher.cs b/src/Dotnet.Script.Core/ScriptPublisher.cs
index d1869e70..e5539481 100644
--- a/src/Dotnet.Script.Core/ScriptPublisher.cs
+++ b/src/Dotnet.Script.Core/ScriptPublisher.cs
@@ -1,10 +1,8 @@
-using Dotnet.Script.Core.Internal;
 using Dotnet.Script.DependencyModel.Environment;
 using Dotnet.Script.DependencyModel.Logging;
 using Dotnet.Script.DependencyModel.Process;
 using Dotnet.Script.DependencyModel.ProjectSystem;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Scripting;
 using System;
 using System.IO;
 using System.Reflection;
@@ -13,7 +11,7 @@ namespace Dotnet.Script.Core
 {
     public class ScriptPublisher
     {
-        private const string ScriptingVersion = "3.8.0-5.final";
+        private const string ScriptingVersion = "3.8.0";
 
         private readonly ScriptProjectProvider _scriptProjectProvider;
         private readonly ScriptEmitter _scriptEmitter;

From 18b9d7ee0b454ac197be316be870ae4ab2196e25 Mon Sep 17 00:00:00 2001
From: filipw <wojcieszyn@gmail.com>
Date: Thu, 10 Dec 2020 20:40:34 +0100
Subject: [PATCH 04/22] moved omnisharp.json to the correct place

---
 src/omnisharp.json => omnisharp.json | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/omnisharp.json => omnisharp.json (100%)

diff --git a/src/omnisharp.json b/omnisharp.json
similarity index 100%
rename from src/omnisharp.json
rename to omnisharp.json

From e422222f6a3db2bc35173d3c3691dc971149de0e Mon Sep 17 00:00:00 2001
From: filipw <wojcieszyn@gmail.com>
Date: Thu, 10 Dec 2020 20:43:31 +0100
Subject: [PATCH 05/22] updated omnisharp.json

---
 omnisharp.json | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/omnisharp.json b/omnisharp.json
index 922da146..93c5d8d9 100644
--- a/omnisharp.json
+++ b/omnisharp.json
@@ -5,5 +5,18 @@
       "**/ScriptPackages/**/*.csx"
     ],
     "userExcludeSearchPatterns": []
+  },
+  "script": {
+    "enableScriptNuGetReferences": true,
+    "defaultTargetFramework": "net5.0"
+  },
+  "FormattingOptions": {
+      "organizeImports": true,
+      "enableEditorConfigSupport": true
+  },
+  "RoslynExtensionsOptions": {
+      "enableImportCompletion": true,
+      "enableAnalyzersSupport": true,
+      "enableDecompilationSupport": true
   }
 }

From 4d8c717fc4969cae343cd675753eb162e9fba56c Mon Sep 17 00:00:00 2001
From: Bernhard Richter <bernhard.richter@gmail.com>
Date: Mon, 8 Feb 2021 21:55:20 +0100
Subject: [PATCH 06/22] Quote chmod as it failes with folders containing
 spaces. fixes #605

---
 src/Dotnet.Script.Core/Scaffolder.cs        |  2 +-
 src/Dotnet.Script.Tests/ScaffoldingTests.cs | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/Dotnet.Script.Core/Scaffolder.cs b/src/Dotnet.Script.Core/Scaffolder.cs
index 78cb9339..ef66970a 100644
--- a/src/Dotnet.Script.Core/Scaffolder.cs
+++ b/src/Dotnet.Script.Core/Scaffolder.cs
@@ -63,7 +63,7 @@ public void CreateNewScriptFile(string fileName, string currentDirectory)
                     RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
                 {
                     // mark .csx file as executable, this activates the shebang to run dotnet-script as interpreter
-                    _commandRunner.Execute($"/bin/chmod", $"+x {pathToScriptFile}");
+                    _commandRunner.Execute($"/bin/chmod", $"+x \"{pathToScriptFile}\"");
                 }
                 _scriptConsole.WriteSuccess($"...'{pathToScriptFile}' [Created]");
             }
diff --git a/src/Dotnet.Script.Tests/ScaffoldingTests.cs b/src/Dotnet.Script.Tests/ScaffoldingTests.cs
index c5dcd506..3aff20da 100644
--- a/src/Dotnet.Script.Tests/ScaffoldingTests.cs
+++ b/src/Dotnet.Script.Tests/ScaffoldingTests.cs
@@ -25,6 +25,8 @@ public void ShouldInitializeScriptFolder()
         {
             using (var scriptFolder = new DisposableFolder())
             {
+                ScriptTestRunner.Default.ExecuteInProcess($"init {scriptFolder.Path}");
+
                 var (output, exitCode) = ScriptTestRunner.Default.Execute("init", scriptFolder.Path);
 
                 Assert.Equal(0, exitCode);
@@ -34,6 +36,24 @@ public void ShouldInitializeScriptFolder()
             }
         }
 
+        [Fact]
+        public void ShouldInitializeScriptFolderContainingWhitespace()
+        {
+            using (var scriptFolder = new DisposableFolder())
+            {
+                var path = Path.Combine(scriptFolder.Path, "Folder with whitespace");
+                Directory.CreateDirectory(path);
+
+                var (output, exitCode) = ScriptTestRunner.Default.Execute("init", path);
+
+                Assert.Equal(0, exitCode);
+                Assert.DoesNotContain("No such file or directory", output, StringComparison.OrdinalIgnoreCase);
+                Assert.True(File.Exists(Path.Combine(path, "main.csx")));
+                Assert.True(File.Exists(Path.Combine(path, "omnisharp.json")));
+                Assert.True(File.Exists(Path.Combine(path, ".vscode", "launch.json")));
+            }
+        }
+
         [OnlyOnUnixFact]
         public void ShouldRegisterToRunCsxScriptDirectly()
         {

From d38a4c911003912a70ae4f08a3505aae54f617ff Mon Sep 17 00:00:00 2001
From: Bernhard Richter <bernhard.richter@gmail.com>
Date: Mon, 8 Feb 2021 22:45:24 +0100
Subject: [PATCH 07/22] Fix scaffolding tests

---
 src/Dotnet.Script.Tests/ScaffoldingTests.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Dotnet.Script.Tests/ScaffoldingTests.cs b/src/Dotnet.Script.Tests/ScaffoldingTests.cs
index 3aff20da..0c8f48cf 100644
--- a/src/Dotnet.Script.Tests/ScaffoldingTests.cs
+++ b/src/Dotnet.Script.Tests/ScaffoldingTests.cs
@@ -25,8 +25,6 @@ public void ShouldInitializeScriptFolder()
         {
             using (var scriptFolder = new DisposableFolder())
             {
-                ScriptTestRunner.Default.ExecuteInProcess($"init {scriptFolder.Path}");
-
                 var (output, exitCode) = ScriptTestRunner.Default.Execute("init", scriptFolder.Path);
 
                 Assert.Equal(0, exitCode);

From c1c7c8ede3d56946089edd1879b1eabbb6668763 Mon Sep 17 00:00:00 2001
From: Daniel Egbers <daniel@egbers.site>
Date: Mon, 23 Nov 2020 19:35:19 +0100
Subject: [PATCH 08/22] cache script per file instead of per directory

---
 src/Dotnet.Script.Core/Commands/ExecuteScriptCommand.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Dotnet.Script.Core/Commands/ExecuteScriptCommand.cs b/src/Dotnet.Script.Core/Commands/ExecuteScriptCommand.cs
index 6bf3809c..470a4e52 100644
--- a/src/Dotnet.Script.Core/Commands/ExecuteScriptCommand.cs
+++ b/src/Dotnet.Script.Core/Commands/ExecuteScriptCommand.cs
@@ -45,7 +45,7 @@ private async Task<TReturn> DownloadAndRunCode<TReturn>(ExecuteScriptCommandOpti
 
         private string GetLibrary(ExecuteScriptCommandOptions executeOptions)
         {
-            var projectFolder = FileUtils.GetPathToScriptTempFolder(Path.GetDirectoryName(executeOptions.File.Path));
+            var projectFolder = FileUtils.GetPathToScriptTempFolder(executeOptions.File.Path);
             var executionCacheFolder = Path.Combine(projectFolder, "execution-cache");
             var pathToLibrary = Path.Combine(executionCacheFolder, "script.dll");
 

From 9dbd650db180475ea76caef82ad0f28e4986816d Mon Sep 17 00:00:00 2001
From: Daniel Egbers <daniel@egbers.site>
Date: Mon, 23 Nov 2020 22:14:21 +0100
Subject: [PATCH 09/22] adjust test to changed cache location

---
 src/Dotnet.Script.Tests/ExecutionCacheTests.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Dotnet.Script.Tests/ExecutionCacheTests.cs b/src/Dotnet.Script.Tests/ExecutionCacheTests.cs
index 64992f3c..6ba4e4b6 100644
--- a/src/Dotnet.Script.Tests/ExecutionCacheTests.cs
+++ b/src/Dotnet.Script.Tests/ExecutionCacheTests.cs
@@ -25,10 +25,12 @@ public void ShouldNotUpdateHashWhenSourceIsNotChanged()
                 WriteScript(pathToScript, "WriteLine(42);");
                 var firstResult = Execute(pathToScript);
                 Assert.Contains("42", firstResult.output);
+                Assert.NotNull(firstResult.hash);
 
                 WriteScript(pathToScript, "WriteLine(42);");
                 var secondResult = Execute(pathToScript);
                 Assert.Contains("42", secondResult.output);
+                Assert.NotNull(secondResult.hash);
 
                 Assert.Equal(firstResult.hash, secondResult.hash);
             }
@@ -45,10 +47,12 @@ public void ShouldUpdateHashWhenSourceChanges()
                 WriteScript(pathToScript, "WriteLine(42);");
                 var firstResult = Execute(pathToScript);
                 Assert.Contains("42", firstResult.output);
+                Assert.NotNull(firstResult.hash);
 
                 WriteScript(pathToScript, "WriteLine(84);");
                 var secondResult = Execute(pathToScript);
                 Assert.Contains("84", secondResult.output);
+                Assert.NotNull(secondResult.hash);
 
                 Assert.NotEqual(firstResult.hash, secondResult.hash);
             }
@@ -103,7 +107,7 @@ public void ShouldCopyDllAndPdbToExecutionCacheFolder()
 
         private static string GetPathToExecutionCache(string pathToScript)
         {
-            var pathToTempFolder = Path.GetDirectoryName(Dotnet.Script.DependencyModel.ProjectSystem.FileUtils.GetPathToScriptTempFolder(pathToScript));
+            var pathToTempFolder = Dotnet.Script.DependencyModel.ProjectSystem.FileUtils.GetPathToScriptTempFolder(pathToScript);
             var pathToExecutionCache = Path.Combine(pathToTempFolder, "execution-cache");
             return pathToExecutionCache;
         }

From 2a098f2a20832cb47b2b47b2f94d2b80b4739427 Mon Sep 17 00:00:00 2001
From: Daniel Egbers <daniel@egbers.site>
Date: Mon, 23 Nov 2020 22:19:44 +0100
Subject: [PATCH 10/22] add test "should cache scripts from same folder
 individually"

---
 .../ExecutionCacheTests.cs                    | 58 ++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/src/Dotnet.Script.Tests/ExecutionCacheTests.cs b/src/Dotnet.Script.Tests/ExecutionCacheTests.cs
index 6ba4e4b6..7b4a0a15 100644
--- a/src/Dotnet.Script.Tests/ExecutionCacheTests.cs
+++ b/src/Dotnet.Script.Tests/ExecutionCacheTests.cs
@@ -1,5 +1,6 @@
-using System.IO;
 using Dotnet.Script.Shared.Tests;
+using System;
+using System.IO;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -89,6 +90,61 @@ public void ShouldCopyDllAndPdbToExecutionCacheFolder()
             }
         }
 
+        [Fact]
+        public void ShouldCacheScriptsFromSameFolderIndividually()
+        {
+            (string Output, bool Cached) Execute(string pathToScript)
+            {
+                var result = ScriptTestRunner.Default.Execute($"{pathToScript} --debug");
+                return (Output: result.output, Cached: result.output.Contains("Using cached compilation"));
+            }
+
+            using (var scriptFolder = new DisposableFolder())
+            {
+                var pathToScriptA = Path.Combine(scriptFolder.Path, "script.csx");
+                var pathToScriptB = Path.Combine(scriptFolder.Path, "script");
+
+
+                var idScriptA = Guid.NewGuid().ToString();
+                File.AppendAllText(pathToScriptA, $@"WriteLine(""{idScriptA}"");");
+
+                var idScriptB = Guid.NewGuid().ToString();
+                File.AppendAllText(pathToScriptB, $@"WriteLine(""{idScriptB}"");");
+
+
+                var firstResultOfScriptA = Execute(pathToScriptA);
+                Assert.Contains(idScriptA, firstResultOfScriptA.Output);
+                Assert.False(firstResultOfScriptA.Cached);
+
+                var firstResultOfScriptB = Execute(pathToScriptB);
+                Assert.Contains(idScriptB, firstResultOfScriptB.Output);
+                Assert.False(firstResultOfScriptB.Cached);
+
+
+                var secondResultOfScriptA = Execute(pathToScriptA);
+                Assert.Contains(idScriptA, secondResultOfScriptA.Output);
+                Assert.True(secondResultOfScriptA.Cached);
+
+                var secondResultOfScriptB = Execute(pathToScriptB);
+                Assert.Contains(idScriptB, secondResultOfScriptB.Output);
+                Assert.True(secondResultOfScriptB.Cached);
+
+
+                var idScriptB2 = Guid.NewGuid().ToString();
+                File.AppendAllText(pathToScriptB, $@"WriteLine(""{idScriptB2}"");");
+
+
+                var thirdResultOfScriptA = Execute(pathToScriptA);
+                Assert.Contains(idScriptA, thirdResultOfScriptA.Output);
+                Assert.True(thirdResultOfScriptA.Cached);
+
+                var thirdResultOfScriptB = Execute(pathToScriptB);
+                Assert.Contains(idScriptB, thirdResultOfScriptB.Output);
+                Assert.Contains(idScriptB2, thirdResultOfScriptB.Output);
+                Assert.False(thirdResultOfScriptB.Cached);
+            }
+        }
+
         private (string output, string hash) Execute(string pathToScript)
         {
             var result = ScriptTestRunner.Default.Execute(pathToScript);

From d88d1db322836bc4a0a27a51acb9a38a79597b32 Mon Sep 17 00:00:00 2001
From: filipw <wojcieszyn@gmail.com>
Date: Fri, 12 Mar 2021 16:41:37 +0100
Subject: [PATCH 11/22] updated to Roslyn 3.9.0

---
 src/Dotnet.Script.Core/Dotnet.Script.Core.csproj              | 2 +-
 .../Dotnet.Script.DependencyModel.NuGet.csproj                | 2 +-
 .../Dotnet.Script.Desktop.Tests.csproj                        | 2 +-
 src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj          | 4 ++--
 src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj            | 2 +-
 src/Dotnet.Script/Dotnet.Script.csproj                        | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
index 1a3c92d2..69438cbf 100644
--- a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
+++ b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
@@ -21,7 +21,7 @@
     <EmbeddedResource Include="**/*.template" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.8.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.9.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ReadLine" Version="2.0.1" />
     <PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
diff --git a/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj b/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj
index 47fb7464..5a80905b 100644
--- a/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj
+++ b/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj
@@ -19,6 +19,6 @@
     <Compile Include="..\Dotnet.Script.DependencyModel\ProjectSystem\ScriptParserInternal.cs" Link="ScriptParserInternal.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.8.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.9.0" />
   </ItemGroup>
 </Project>
diff --git a/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj b/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj
index fd6ac52f..4b808e59 100644
--- a/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj
+++ b/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net472</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj b/src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj
index 84c07d06..5dadb071 100644
--- a/src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj
+++ b/src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj
@@ -12,8 +12,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.7.0" />
-    <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.9.0" />
+    <PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj
index b08a3b76..0b20e8de 100644
--- a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj
+++ b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj
@@ -8,7 +8,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj
index 1f2b2597..876183a7 100644
--- a/src/Dotnet.Script/Dotnet.Script.csproj
+++ b/src/Dotnet.Script/Dotnet.Script.csproj
@@ -22,7 +22,7 @@
         <LangVersion>latest</LangVersion>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
         <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.2.5" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.6" />
     </ItemGroup>

From 710e7340b18eeda416ebceee075d60bf124f0d03 Mon Sep 17 00:00:00 2001
From: Filip W <wojcieszyn@gmail.com>
Date: Fri, 12 Mar 2021 21:22:36 +0100
Subject: [PATCH 12/22] 3.9.0

---
 src/Dotnet.Script.Core/ScriptPublisher.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Dotnet.Script.Core/ScriptPublisher.cs b/src/Dotnet.Script.Core/ScriptPublisher.cs
index e5539481..ed655fd8 100644
--- a/src/Dotnet.Script.Core/ScriptPublisher.cs
+++ b/src/Dotnet.Script.Core/ScriptPublisher.cs
@@ -11,7 +11,7 @@ namespace Dotnet.Script.Core
 {
     public class ScriptPublisher
     {
-        private const string ScriptingVersion = "3.8.0";
+        private const string ScriptingVersion = "3.9.0";
 
         private readonly ScriptProjectProvider _scriptProjectProvider;
         private readonly ScriptEmitter _scriptEmitter;

From 6dcd3d246593d035779da75b75d3cff5b594e889 Mon Sep 17 00:00:00 2001
From: Bernhard Richter <bernhard.richter@gmail.com>
Date: Mon, 19 Apr 2021 23:15:43 +0200
Subject: [PATCH 13/22] Added test for issue 613

---
 .../ScriptExecutionTests.cs                    |  7 +++++++
 .../TestFixtures/Issue613/Issue613.csx         | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 src/Dotnet.Script.Tests/TestFixtures/Issue613/Issue613.csx

diff --git a/src/Dotnet.Script.Tests/ScriptExecutionTests.cs b/src/Dotnet.Script.Tests/ScriptExecutionTests.cs
index 2c41ceaf..62c84cb8 100644
--- a/src/Dotnet.Script.Tests/ScriptExecutionTests.cs
+++ b/src/Dotnet.Script.Tests/ScriptExecutionTests.cs
@@ -351,6 +351,13 @@ public void ShouldThrowMeaningfulErrorMessageWhenDependencyIsNotFound()
             }
         }
 
+        [Fact]
+        public void ShouldHandleIssue613()
+        {
+            var result = ScriptTestRunner.Default.ExecuteFixture("Issue613");
+            Assert.Equal(0, result.exitCode);
+        }
+
         [Fact]
         public void ShouldHandleIssue235()
         {
diff --git a/src/Dotnet.Script.Tests/TestFixtures/Issue613/Issue613.csx b/src/Dotnet.Script.Tests/TestFixtures/Issue613/Issue613.csx
new file mode 100644
index 00000000..bbe48cd4
--- /dev/null
+++ b/src/Dotnet.Script.Tests/TestFixtures/Issue613/Issue613.csx
@@ -0,0 +1,18 @@
+#r "nuget: System.Text.Encoding.CodePages, 5.0.0"
+
+public class Script
+{
+    public static void Run()
+    {
+        try
+        {
+            System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
+        }
+        catch (Exception ex)
+        {
+            System.Console.WriteLine(ex.ToString());
+        }
+    }
+}
+
+Script.Run();
\ No newline at end of file

From d41dbaea6614c07a82499643ff773528e9bac261 Mon Sep 17 00:00:00 2001
From: Bernhard Richter <bernhard.richter@gmail.com>
Date: Mon, 19 Apr 2021 23:28:04 +0200
Subject: [PATCH 14/22] Bump deps in Dotnet.Script.Core

---
 src/Dotnet.Script.Core/Dotnet.Script.Core.csproj   | 4 ++--
 src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
index 69438cbf..a5eac338 100644
--- a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
+++ b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
@@ -30,8 +30,8 @@
     <!-- The following references are just quick fixes for issue #166 and issue #268
     We need to figure out why we can't load these via the dependency context.
      -->
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Dotnet.Script.DependencyModel.Nuget\Dotnet.Script.DependencyModel.NuGet.csproj" />
diff --git a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj
index 0b20e8de..2a3c8f09 100644
--- a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj
+++ b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>

From 2aa98b7c57ac540c19a21c1df2600a0dde02580d Mon Sep 17 00:00:00 2001
From: Bernhard Richter <bernhard.richter@gmail.com>
Date: Mon, 19 Apr 2021 23:30:09 +0200
Subject: [PATCH 15/22] Re-enable tests for 2.1 and 3.1

---
 src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj
index 2a3c8f09..2eb07935 100644
--- a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj
+++ b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>

From 6c32c92714a0f6a97dc94ea1406375387b0f0824 Mon Sep 17 00:00:00 2001
From: Bernhard Richter <bernhard.richter@gmail.com>
Date: Tue, 20 Apr 2021 16:30:36 +0200
Subject: [PATCH 16/22] Bump Microsoft.Extensions.Logging.COnsole to 5.0.0

---
 src/Dotnet.Script/Dotnet.Script.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj
index 876183a7..12227712 100644
--- a/src/Dotnet.Script/Dotnet.Script.csproj
+++ b/src/Dotnet.Script/Dotnet.Script.csproj
@@ -24,7 +24,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
         <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.2.5" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.6" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Dotnet.Script.Core\Dotnet.Script.Core.csproj" />

From e0f0d5d63e2b252af3ffa826e63f91ff84424538 Mon Sep 17 00:00:00 2001
From: Bernhard Richter <bernhard.richter@gmail.com>
Date: Tue, 20 Apr 2021 17:40:34 +0200
Subject: [PATCH 17/22] Bump version to 1.0.2

---
 src/Dotnet.Script.Core/Dotnet.Script.Core.csproj | 2 +-
 src/Dotnet.Script/Dotnet.Script.csproj           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
index a5eac338..a430d74b 100644
--- a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
+++ b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>A cross platform library allowing you to run C# (CSX) scripts with support for debugging and inline NuGet packages. Based on Roslyn.</Description>
-    <VersionPrefix>1.0.1</VersionPrefix>
+    <VersionPrefix>1.0.2</VersionPrefix>
     <Authors>filipw</Authors>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AssemblyName>Dotnet.Script.Core</AssemblyName>
diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj
index 12227712..4216e48a 100644
--- a/src/Dotnet.Script/Dotnet.Script.csproj
+++ b/src/Dotnet.Script/Dotnet.Script.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <Description>Dotnet CLI tool allowing you to run C# (CSX) scripts.</Description>
-        <VersionPrefix>1.0.1</VersionPrefix>
+        <VersionPrefix>1.0.2</VersionPrefix>
         <Authors>filipw</Authors>
         <PackageId>Dotnet.Script</PackageId>
         <TargetFrameworks>net5.0;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>

From 1f6f058c140c03c6f12558c60517431512e593bd Mon Sep 17 00:00:00 2001
From: filipw <wojcieszyn@gmail.com>
Date: Fri, 30 Apr 2021 11:56:46 +0200
Subject: [PATCH 18/22] added strong naming

---
 Dotnet.Script.sln                                 |   8 ++++----
 build/dotnet-script.snk                           | Bin 0 -> 596 bytes
 src/Dotnet.Script.Core/Dotnet.Script.Core.csproj  |   4 +++-
 src/Dotnet.Script.Core/Properties/AssemblyInfo.cs |   4 ++--
 .../Dotnet.Script.DependencyModel.NuGet.csproj    |   4 +++-
 .../AssemblyProperties.cs                         |   2 +-
 .../Dotnet.Script.DependencyModel.csproj          |   4 +++-
 .../Dotnet.Script.Desktop.Tests.csproj            |   2 ++
 .../Dotnet.Script.Shared.Tests.csproj             |   2 ++
 .../Dotnet.Script.Tests.csproj                    |   2 ++
 src/Dotnet.Script/Dotnet.Script.csproj            |   4 +++-
 11 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 build/dotnet-script.snk

diff --git a/Dotnet.Script.sln b/Dotnet.Script.sln
index 43cd597b..ea675183 100644
--- a/Dotnet.Script.sln
+++ b/Dotnet.Script.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2005
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31129.286
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dotnet.Script", "src\Dotnet.Script\Dotnet.Script.csproj", "{057F56AD-AF29-4ABD-B6DE-26E4DEE169F7}"
 EndProject
@@ -14,9 +14,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dotnet.Script.DependencyMod
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dotnet.Script.DependencyModel.NuGet", "src\Dotnet.Script.DependencyModel.Nuget\Dotnet.Script.DependencyModel.NuGet.csproj", "{E361528F-178A-4489-AF01-FFD3A7122D99}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dotnet.Script.Desktop.Tests", "src\Dotnet.Script.Desktop.Tests\Dotnet.Script.Desktop.Tests.csproj", "{B0E5959C-6E7F-4023-96BA-5AD4A5E00541}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dotnet.Script.Desktop.Tests", "src\Dotnet.Script.Desktop.Tests\Dotnet.Script.Desktop.Tests.csproj", "{B0E5959C-6E7F-4023-96BA-5AD4A5E00541}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dotnet.Script.Shared.Tests", "src\Dotnet.Script.Shared.Tests\Dotnet.Script.Shared.Tests.csproj", "{8FFA2816-411E-437C-AB75-FFA546780E7A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dotnet.Script.Shared.Tests", "src\Dotnet.Script.Shared.Tests\Dotnet.Script.Shared.Tests.csproj", "{8FFA2816-411E-437C-AB75-FFA546780E7A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F20002BB-970C-4318-B618-58D478CAC405}"
 EndProject
diff --git a/build/dotnet-script.snk b/build/dotnet-script.snk
new file mode 100644
index 0000000000000000000000000000000000000000..23f209ff381867efc12d55156e879c801d5020dc
GIT binary patch
literal 596
zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098`c?mUQgmtP!!m<KXCz5TJUrGBm#zpn6
zx4=8r7(Fr2FG8);vdcciu;mEF&jLq_K>&)#rl#95POPKWc*?9not5V3UTpgo{geK{
zzSz8Qcy$tPSAOToZvGW>c6rgH-5USwo{wA`Z)F(O8_gXz7`U=&NK@|cSu%{MA8x6i
zZ_I>M@MRrdgAdl8xfh)`@HDE~lT$>cdF0D?GVewayFElLB{~%&JFxB)<NiQfC$b`9
z*xdm=Oy)FVOl!qw&lxU_W1gkf{fR&tFwhudSS<q@b)jiriIQCvi|2f=ZAjlR-pHCE
zg<;_%RKE&7w^%I&38{MMUnU`#t+d;RW;p&Fd45w6pw_CQ%iciHaPglN0wLQxi(pli
z_S-ptq|-B9dfCSrxVvlZ{_=bD3Uiid%s=tuoT8b$zVE#^4%<`Ab?iuNfm06?k{uBv
zLJOyA?Kh5L>4dY~8REmUGE6l9AZ7G^VAvl%8VhBc0Xt@(<mye6{_j+f>M52A6V$Gc
z#t1<lUjXN6Mqo@y-zS{ju0iqEn2XhU){t=gTU|$M4ig7qOlYJQTA8PU0#+z>Dg^94
zparwHGDcUOZ>W{KRIT{)K5^P5p2a)G++A9kXj^~g2x`AFS(^6E*89n)q{hoDXj$ib
zR#rgFpa*DIkGvm=|5rF9+ZOD307+mi*bdFmH+Z%udIiJ&Rg;9tz2SdXe0ny`!Vl@@
i=|k{^AkVr(&k&yti4lA#^2;D>7L~$MNE)b4q6dJ84;>r;

literal 0
HcmV?d00001

diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
index a430d74b..59745134 100644
--- a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
+++ b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>A cross platform library allowing you to run C# (CSX) scripts with support for debugging and inline NuGet packages. Based on Roslyn.</Description>
-    <VersionPrefix>1.0.2</VersionPrefix>
+    <VersionPrefix>1.1.0</VersionPrefix>
     <Authors>filipw</Authors>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AssemblyName>Dotnet.Script.Core</AssemblyName>
@@ -16,6 +16,8 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>../../build/dotnet-script.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="**/*.template" />
diff --git a/src/Dotnet.Script.Core/Properties/AssemblyInfo.cs b/src/Dotnet.Script.Core/Properties/AssemblyInfo.cs
index 103e9c2c..232e7d89 100644
--- a/src/Dotnet.Script.Core/Properties/AssemblyInfo.cs
+++ b/src/Dotnet.Script.Core/Properties/AssemblyInfo.cs
@@ -17,5 +17,5 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("684fefee-451b-4e68-b662-c16e3a7da794")]
-[assembly: InternalsVisibleTo("Dotnet.Script.Shared.Tests")]
-[assembly: InternalsVisibleTo("Dotnet.Script.Tests")]
+[assembly: InternalsVisibleTo("Dotnet.Script.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f9790935628475aa44c2b2025427926d965f49fb36c645f5aeb7c03bd6183d31d02f42add3b2cb3ec4b0e508c5cf02478b41008ac8a6a6db314eaca3d678caac419d95e6e85e6cfb16fd93fec0bed8bc707875126e577ee7c96efe15737679d1a4dd1affec9e8f5c1b6f6518d51bcd1d3718b8b2694853eef059328ca81f6ea9")]
+[assembly: InternalsVisibleTo("Dotnet.Script.Shared.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f9790935628475aa44c2b2025427926d965f49fb36c645f5aeb7c03bd6183d31d02f42add3b2cb3ec4b0e508c5cf02478b41008ac8a6a6db314eaca3d678caac419d95e6e85e6cfb16fd93fec0bed8bc707875126e577ee7c96efe15737679d1a4dd1affec9e8f5c1b6f6518d51bcd1d3718b8b2694853eef059328ca81f6ea9")]
diff --git a/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj b/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj
index 5a80905b..dba774d7 100644
--- a/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj
+++ b/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj
@@ -8,11 +8,13 @@
     <RepositoryUrl>https://github.com/filipw/dotnet-script.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>script;csx;csharp;roslyn;nuget</PackageTags>
-    <Version>1.0.1</Version>
+    <Version>1.1.0</Version>
     <Description>A MetadataReferenceResolver that allows inline nuget references to be specified in script(csx) files.</Description>
     <Authors>dotnet-script</Authors>
     <Company>dotnet-script</Company>
     <LangVersion>latest</LangVersion>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>../../build/dotnet-script.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Dotnet.Script.DependencyModel/AssemblyProperties.cs b/src/Dotnet.Script.DependencyModel/AssemblyProperties.cs
index 50be859b..210cb3df 100644
--- a/src/Dotnet.Script.DependencyModel/AssemblyProperties.cs
+++ b/src/Dotnet.Script.DependencyModel/AssemblyProperties.cs
@@ -1,3 +1,3 @@
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("Dotnet.Script.Tests")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("Dotnet.Script.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f9790935628475aa44c2b2025427926d965f49fb36c645f5aeb7c03bd6183d31d02f42add3b2cb3ec4b0e508c5cf02478b41008ac8a6a6db314eaca3d678caac419d95e6e85e6cfb16fd93fec0bed8bc707875126e577ee7c96efe15737679d1a4dd1affec9e8f5c1b6f6518d51bcd1d3718b8b2694853eef059328ca81f6ea9")]
\ No newline at end of file
diff --git a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj
index 20568bf4..71e53abe 100644
--- a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj
+++ b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj
@@ -11,8 +11,10 @@
     <RepositoryUrl>https://github.com/filipw/dotnet-script.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>script;csx;csharp;roslyn;omnisharp</PackageTags>
-    <Version>1.0.2</Version>
+    <Version>1.1.0</Version>
     <LangVersion>latest</LangVersion>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\build\dotnet-script.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj b/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj
index 4b808e59..67e87f2e 100644
--- a/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj
+++ b/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj
@@ -2,6 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>../../build/dotnet-script.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
diff --git a/src/Dotnet.Script.Shared.Tests/Dotnet.Script.Shared.Tests.csproj b/src/Dotnet.Script.Shared.Tests/Dotnet.Script.Shared.Tests.csproj
index 0c609055..30aea020 100644
--- a/src/Dotnet.Script.Shared.Tests/Dotnet.Script.Shared.Tests.csproj
+++ b/src/Dotnet.Script.Shared.Tests/Dotnet.Script.Shared.Tests.csproj
@@ -2,6 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>../../build/dotnet-script.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj
index 2eb07935..b6c076c6 100644
--- a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj
+++ b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj
@@ -2,6 +2,8 @@
   <PropertyGroup>
     <TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>../../build/dotnet-script.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="coverlet.msbuild" Version="2.8.0">
diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj
index 4216e48a..d6b5b328 100644
--- a/src/Dotnet.Script/Dotnet.Script.csproj
+++ b/src/Dotnet.Script/Dotnet.Script.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <Description>Dotnet CLI tool allowing you to run C# (CSX) scripts.</Description>
-        <VersionPrefix>1.0.2</VersionPrefix>
+        <VersionPrefix>1.1.0</VersionPrefix>
         <Authors>filipw</Authors>
         <PackageId>Dotnet.Script</PackageId>
         <TargetFrameworks>net5.0;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
@@ -20,6 +20,8 @@
         <PackAsTool>false</PackAsTool>
         <IsPackable>true</IsPackable>
         <LangVersion>latest</LangVersion>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>../../build/dotnet-script.snk</AssemblyOriginatorKeyFile>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />

From 59ac154d8c49a66663a63c98794c68c227e25885 Mon Sep 17 00:00:00 2001
From: filipw <wojcieszyn@gmail.com>
Date: Fri, 30 Apr 2021 12:43:38 +0200
Subject: [PATCH 19/22] fixed path

---
 .../Dotnet.Script.DependencyModel.csproj                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj
index 71e53abe..f0824f9d 100644
--- a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj
+++ b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj
@@ -14,7 +14,7 @@
     <Version>1.1.0</Version>
     <LangVersion>latest</LangVersion>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\build\dotnet-script.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>../../build/dotnet-script.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>

From 7a55131ccdf8e1f44ed0474c82649573596a43a7 Mon Sep 17 00:00:00 2001
From: filipw <wojcieszyn@gmail.com>
Date: Fri, 30 Apr 2021 12:45:01 +0200
Subject: [PATCH 20/22] added StrongNamer

---
 src/Dotnet.Script.Core/Dotnet.Script.Core.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
index 59745134..0f803746 100644
--- a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
+++ b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
@@ -34,6 +34,7 @@
      -->
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
+    <PackageReference Include="StrongNamer" Version="0.2.5" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Dotnet.Script.DependencyModel.Nuget\Dotnet.Script.DependencyModel.NuGet.csproj" />

From 42fd5d904efd9b214500040142f5da7af0d56680 Mon Sep 17 00:00:00 2001
From: filipw <wojcieszyn@gmail.com>
Date: Fri, 30 Apr 2021 12:58:34 +0200
Subject: [PATCH 21/22] moved the SNK

---
 src/Dotnet.Script.Core/Dotnet.Script.Core.csproj    |   2 +-
 .../Dotnet.Script.DependencyModel.NuGet.csproj      |   2 +-
 .../Dotnet.Script.DependencyModel.csproj            |   2 +-
 .../Dotnet.Script.Desktop.Tests.csproj              |   2 +-
 .../Dotnet.Script.Shared.Tests.csproj               |   2 +-
 src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj  |   2 +-
 src/Dotnet.Script/Dotnet.Script.csproj              |   2 +-
 {build => src}/dotnet-script.snk                    | Bin
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename {build => src}/dotnet-script.snk (100%)

diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
index 0f803746..24a97b2f 100644
--- a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
+++ b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
@@ -17,7 +17,7 @@
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>../../build/dotnet-script.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="**/*.template" />
diff --git a/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj b/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj
index dba774d7..becaacfe 100644
--- a/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj
+++ b/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj
@@ -14,7 +14,7 @@
     <Company>dotnet-script</Company>
     <LangVersion>latest</LangVersion>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>../../build/dotnet-script.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj
index f0824f9d..c1141c7b 100644
--- a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj
+++ b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj
@@ -14,7 +14,7 @@
     <Version>1.1.0</Version>
     <LangVersion>latest</LangVersion>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>../../build/dotnet-script.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj b/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj
index 67e87f2e..50fed14e 100644
--- a/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj
+++ b/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>../../build/dotnet-script.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
diff --git a/src/Dotnet.Script.Shared.Tests/Dotnet.Script.Shared.Tests.csproj b/src/Dotnet.Script.Shared.Tests/Dotnet.Script.Shared.Tests.csproj
index 30aea020..2b928e99 100644
--- a/src/Dotnet.Script.Shared.Tests/Dotnet.Script.Shared.Tests.csproj
+++ b/src/Dotnet.Script.Shared.Tests/Dotnet.Script.Shared.Tests.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>../../build/dotnet-script.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj
index b6c076c6..504cb2c0 100644
--- a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj
+++ b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj
@@ -3,7 +3,7 @@
     <TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>../../build/dotnet-script.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="coverlet.msbuild" Version="2.8.0">
diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj
index d6b5b328..7cbd6249 100644
--- a/src/Dotnet.Script/Dotnet.Script.csproj
+++ b/src/Dotnet.Script/Dotnet.Script.csproj
@@ -21,7 +21,7 @@
         <IsPackable>true</IsPackable>
         <LangVersion>latest</LangVersion>
         <SignAssembly>true</SignAssembly>
-        <AssemblyOriginatorKeyFile>../../build/dotnet-script.snk</AssemblyOriginatorKeyFile>
+        <AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
diff --git a/build/dotnet-script.snk b/src/dotnet-script.snk
similarity index 100%
rename from build/dotnet-script.snk
rename to src/dotnet-script.snk

From 6c6a15c0150f04f05a85432a85d498f2df4a794a Mon Sep 17 00:00:00 2001
From: filipw <wojcieszyn@gmail.com>
Date: Fri, 30 Apr 2021 13:30:32 +0200
Subject: [PATCH 22/22] added StrongNamer to desktop tests

---
 .../Dotnet.Script.Desktop.Tests.csproj                           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj b/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj
index 50fed14e..cbe23b97 100644
--- a/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj
+++ b/src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj
@@ -14,6 +14,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="StrongNamer" Version="0.2.5" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://github.com/dotnet-script/dotnet-script/compare/1.0.1...1.1.0.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://github.com/dotnet-script/dotnet-script/compare/1.0.1...1.1.0.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://github.com/dotnet-script/dotnet-script/compare/1.0.1...1.1.0.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://github.com/dotnet-script/dotnet-script/compare/1.0.1...1.1.0.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>