From 1f6f058c140c03c6f12558c60517431512e593bd Mon Sep 17 00:00:00 2001 From: filipw Date: Fri, 30 Apr 2021 11:56:46 +0200 Subject: [PATCH 1/5] 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&)#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)4dY~8REmUGE6l9AZ7G^VAvl%8VhBc0Xt@(M52A6V$Gc z#t1Dg^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 @@ A cross platform library allowing you to run C# (CSX) scripts with support for debugging and inline NuGet packages. Based on Roslyn. - 1.0.2 + 1.1.0 filipw netstandard2.0 Dotnet.Script.Core @@ -16,6 +16,8 @@ false false false + true + ../../build/dotnet-script.snk 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 @@ https://github.com/filipw/dotnet-script.git git script;csx;csharp;roslyn;nuget - 1.0.1 + 1.1.0 A MetadataReferenceResolver that allows inline nuget references to be specified in script(csx) files. dotnet-script dotnet-script latest + true + ../../build/dotnet-script.snk 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 @@ https://github.com/filipw/dotnet-script.git git script;csx;csharp;roslyn;omnisharp - 1.0.2 + 1.1.0 latest + true + ..\..\build\dotnet-script.snk 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 @@ net472 + true + ../../build/dotnet-script.snk 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 @@ netstandard2.0 + true + ../../build/dotnet-script.snk 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 @@ net5.0;netcoreapp3.1;netcoreapp2.1 false + true + ../../build/dotnet-script.snk 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 @@  Dotnet CLI tool allowing you to run C# (CSX) scripts. - 1.0.2 + 1.1.0 filipw Dotnet.Script net5.0;netcoreapp2.1;netcoreapp3.1 @@ -20,6 +20,8 @@ false true latest + true + ../../build/dotnet-script.snk From 59ac154d8c49a66663a63c98794c68c227e25885 Mon Sep 17 00:00:00 2001 From: filipw Date: Fri, 30 Apr 2021 12:43:38 +0200 Subject: [PATCH 2/5] 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 @@ 1.1.0 latest true - ..\..\build\dotnet-script.snk + ../../build/dotnet-script.snk From 7a55131ccdf8e1f44ed0474c82649573596a43a7 Mon Sep 17 00:00:00 2001 From: filipw Date: Fri, 30 Apr 2021 12:45:01 +0200 Subject: [PATCH 3/5] 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 @@ --> + From 42fd5d904efd9b214500040142f5da7af0d56680 Mon Sep 17 00:00:00 2001 From: filipw Date: Fri, 30 Apr 2021 12:58:34 +0200 Subject: [PATCH 4/5] 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 @@ false false true - ../../build/dotnet-script.snk + ../dotnet-script.snk 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 @@ dotnet-script latest true - ../../build/dotnet-script.snk + ../dotnet-script.snk 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 @@ 1.1.0 latest true - ../../build/dotnet-script.snk + ../dotnet-script.snk 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 @@ net472 true - ../../build/dotnet-script.snk + ../dotnet-script.snk 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 @@ netstandard2.0 true - ../../build/dotnet-script.snk + ../dotnet-script.snk 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 @@ net5.0;netcoreapp3.1;netcoreapp2.1 false true - ../../build/dotnet-script.snk + ../dotnet-script.snk 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 @@ true latest true - ../../build/dotnet-script.snk + ../dotnet-script.snk 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 Date: Fri, 30 Apr 2021 13:30:32 +0200 Subject: [PATCH 5/5] 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 @@ +