8000 Merge pull request #618 from filipw/feature/strong-naming · dotnet-script/dotnet-script@75ec06c · GitHub
[go: up one dir, main page]

Skip to content

Commit 75ec06c

Browse files
authored
Merge pull request #618 from filipw/feature/strong-naming
added strong naming
2 parents 984b9c6 + 6c6a15c commit 75ec06c

File tree

11 files changed

+27
-11
lines changed

11 files changed

+27
-11
lines changed

Dotnet.Script.sln

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 15
3-
VisualStudioVersion = 15.0.27004.2005
2+
# Visual Studio Version 16
3+
VisualStudioVersion = 16.0.31129.286
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dotnet.Script", "src\Dotnet.Script\Dotnet.Script.csproj", "{057F56AD-AF29-4ABD-B6DE-26E4DEE169F7}"
66
EndProject
@@ -14,9 +14,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dotnet.Script.DependencyMod
1414
EndProject
1515
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}"
1616
EndProject
17-
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}"
17+
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}"
1818
EndProject
19-
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}"
19+
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}"
2020
EndProject
2121
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F20002BB-970C-4318-B618-58D478CAC405}"
2222
EndProject

src/Dotnet.Script.Core/Dotnet.Script.Core.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<Description>A cross platform library allowing you to run C# (CSX) scripts with support for debugging and inline NuGet packages. Based on Roslyn.</Description>
5-
<VersionPrefix>1.0.2</VersionPrefix>
5+
<VersionPrefix>1.1.0</VersionPrefix>
66
<Authors>filipw</Authors>
77
<TargetFrameworks>netstandard2.0</TargetFrameworks>
88
<AssemblyName>Dotnet.Script.Core</AssemblyName>
@@ -16,6 +16,8 @@
1616
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1717
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1818
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
19+
<SignAssembly>true</SignAssembly>
20+
<AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
1921
</PropertyGroup>
2022
<ItemGroup>
2123
<EmbeddedResource Include="**/*.template" />
@@ -32,6 +34,7 @@
3234
-->
3335
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
3436
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
37+
<PackageReference Include="StrongNamer" Version="0.2.5" PrivateAssets="all" />
3538
</ItemGroup>
3639
<ItemGroup>
3740
<ProjectReference Include="..\Dotnet.Script.DependencyModel.Nuget\Dotnet.Script.DependencyModel.NuGet.csproj" />

src/Dotnet.Script.Core/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717

1818
// The following GUID is for the ID of the typelib if this project is exposed to COM
1919
[assembly: Guid("684fefee-451b-4e68-b662-c16e3a7da794")]
20-
[assembly: InternalsVisibleTo("Dotnet.Script.Shared.Tests")]
21-
[assembly: InternalsVisibleTo("Dotnet.Script.Tests")]
20+
[assembly: InternalsVisibleTo("Dotnet.Script.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f9790935628475aa44c2b2025427926d965f49fb36c645f5aeb7c03bd6183d31d02f42add3b2cb3ec4b0e508c5cf02478b41008ac8a6a6db314eaca3d678caac419d95e6e85e6cfb16fd93fec0bed8bc707875126e577ee7c96efe15737679d1a4dd1affec9e8f5c1b6f6518d51bcd1d3718b8b2694853eef059328ca81f6ea9")]
21+
[assembly: InternalsVisibleTo("Dotnet.Script.Shared.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f9790935628475aa44c2b2025427926d965f49fb36c645f5aeb7c03bd6183d31d02f42add3b2cb3ec4b0e508c5cf02478b41008ac8a6a6db314eaca3d678caac419d95e6e85e6cfb16fd93fec0bed8bc707875126e577ee7c96efe15737679d1a4dd1affec9e8f5c1b6f6518d51bcd1d3718b8b2694853eef059328ca81f6ea9")]

src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@
88
<RepositoryUrl>https://github.com/filipw/dotnet-script.git</RepositoryUrl>
99
<RepositoryType>git</RepositoryType>
1010
<PackageTags>script;csx;csharp;roslyn;nuget</PackageTags>
11-
<Version>1.0.1</Version>
11+
<Version>1.1.0</Version>
1212
<Description>A MetadataReferenceResolver that allows inline nuget references to be specified in script(csx) files.</Description>
1313
<Authors>dotnet-script</Authors>
1414
<Company>dotnet-script</Company>
1515
<LangVersion>latest</LangVersion>
16+
<SignAssembly>true</SignAssembly>
17+
<AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
1618
</PropertyGroup>
1719

1820
<ItemGroup>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
using System.Runtime.CompilerServices;
22

3-
[assembly: InternalsVisibleTo("Dotnet.Script.Tests")]
3+
[assembly: InternalsVisibleTo("Dotnet.Script.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f9790935628475aa44c2b2025427926d965f49fb36c645f5aeb7c03bd6183d31d02f42add3b2cb3ec4b0e508c5cf02478b41008ac8a6a6db314eaca3d678caac419d95e6e85e6cfb16fd93fec0bed8bc707875126e577ee7c96efe15737679d1a4dd1affec9e8f5c1b6f6518d51bcd1d3718b8b2694853eef059328ca81f6ea9")]

src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111
<RepositoryUrl>https://github.com/filipw/dotnet-script.git</RepositoryUrl>
1212
<RepositoryType>git</RepositoryType>
1313
<PackageTags>script;csx;csharp;roslyn;omnisharp</PackageTags>
14-
<Version>1.0.2</Version>
14+
<Version>1.1.0</Version>
1515
<LangVersion>latest</LangVersion>
16+
<SignAssembly>true</SignAssembly>
17+
<AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
1618
</PropertyGroup>
1719

1820
<ItemGroup>

src/Dotnet.Script.Desktop.Tests/Dotnet.Script.Desktop.Tests.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
<PropertyGroup>
44
<TargetFramework>net472</TargetFramework>
5+
<SignAssembly>true</SignAssembly>
6+
<AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
57
</PropertyGroup>
68
<ItemGroup>
79
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
@@ -12,6 +14,7 @@
1214
</PackageReference>
1315
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
1416
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
17+
<PackageReference Include="StrongNamer" Version="0.2.5" PrivateAssets="all" />
1518
</ItemGroup>
1619

1720
<ItemGroup>

src/Dotnet.Script.Shared.Tests/Dotnet.Script.Shared.Tests.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5+
<SignAssembly>true</SignAssembly>
6+
<AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
57
</PropertyGroup>
68

79
<ItemGroup>

src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<PropertyGroup>
33
<TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
44
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
5+
<SignAssembly>true</SignAssembly>
6+
<AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
57
</PropertyGroup>
68
<ItemGroup>
79
<PackageReference Include="coverlet.msbuild" Version="2.8.0">

src/Dotnet.Script/Dotnet.Script.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Description>Dotnet CLI tool allowing you to run C# (CSX) scripts.</Description>
4-
<VersionPrefix>1.0.2</VersionPrefix>
4+
<VersionPrefix>1.1.0</VersionPrefix>
55
<Authors>filipw</Authors>
66
<PackageId>Dotnet.Script</PackageId>
77
<TargetFrameworks>net5.0;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
@@ -20,6 +20,8 @@
2020
<PackAsTool>false</PackAsTool>
2121
<IsPackable>true</IsPackable>
2222
<LangVersion>latest</LangVersion>
23+
<SignAssembly>true</SignAssembly>
24+
<AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
2325
</PropertyGroup>
2426
<ItemGroup>
2527
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />

src/dotnet-script.snk

596 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)
0