summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLlewellyn Pritchard <xacc.ide@gmail.com>2024-02-23 14:42:06 +0200
committerLlewellyn Pritchard <xacc.ide@gmail.com>2024-02-23 14:42:06 +0200
commit5e322a13224266ec19bfc0763603db12c81a80b4 (patch)
treee03a13fe470501a4c1b78c09c88b9e34bd8c194b
parent113b61fce17b7952b5294f0b0c2dba09bf60b159 (diff)
Remove strong naming
-rw-r--r--IronScheme/IronScheme.Closures/IronScheme.Closures.csproj4
-rw-r--r--IronScheme/IronScheme.Closures/IronScheme.Glue.il1
-rw-r--r--IronScheme/IronScheme.Closures/Properties/AssemblyInfo.cs4
-rw-r--r--IronScheme/IronScheme.Console/IronScheme.Console.csproj2
-rw-r--r--IronScheme/IronScheme.Console/ironscheme.boot.dllbin1224704 -> 1224704 bytes
-rw-r--r--IronScheme/IronScheme.FrameworkPAL/IronScheme.FrameworkPAL.csproj2
-rw-r--r--IronScheme/IronScheme/IronScheme.csproj2
-rw-r--r--IronScheme/Microsoft.Scripting/Generation/AssemblyGen.cs4
-rw-r--r--IronScheme/Microsoft.Scripting/IronScheme.Scripting.csproj2
-rw-r--r--IronScheme/Oyster.IntX/Oyster.IntX.csproj3
-rw-r--r--IronScheme/package.cmd4
11 files changed, 5 insertions, 23 deletions
diff --git a/IronScheme/IronScheme.Closures/IronScheme.Closures.csproj b/IronScheme/IronScheme.Closures/IronScheme.Closures.csproj
index 1778502e..cb808729 100644
--- a/IronScheme/IronScheme.Closures/IronScheme.Closures.csproj
+++ b/IronScheme/IronScheme.Closures/IronScheme.Closures.csproj
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net20</TargetFrameworks>
- <SignAssembly>true</SignAssembly>
- <AssemblyOriginatorKeyFile>../DEVELOPMENT.snk</AssemblyOriginatorKeyFile>
<AssemblyTitle>IronScheme.Closures</AssemblyTitle>
<Product>IronScheme.Closures</Product>
<Copyright>Copyright © 2008</Copyright>
@@ -30,6 +28,6 @@
</Content>
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
- <Exec Command="&quot;$(TargetFrameworkSDKToolsDirectory)ildasm&quot; /out:&quot;$(TargetDir)$(TargetName).il&quot; /NOBAR /LINENUM &quot;$(TargetPath)&quot;&#xD;&#xA;&quot;$(SolutionDir)TailCallMaker\$(OutDir)TailCallMaker.exe&quot; &quot;$(TargetDir)$(TargetName).il&quot;&#xD;&#xA;&quot;$(TargetedFrameworkDir)\ilasm&quot; /dll /PDB /NOLOGO /QUIET /KEY=&quot;$(SolutionDir)DEVELOPMENT.snk&quot; /out:&quot;$(TargetDir)$(TargetName).dll&quot; /res:&quot;$(TargetDir)$(TargetName).res&quot; &quot;$(TargetDir)$(TargetName).il&quot; &quot;$(TargetDir)IronScheme.Glue.il&quot;" />
+ <Exec Command="&quot;$(TargetFrameworkSDKToolsDirectory)ildasm&quot; /out:&quot;$(TargetDir)$(TargetName).il&quot; /NOBAR /LINENUM &quot;$(TargetPath)&quot;&#xD;&#xA;&quot;$(SolutionDir)TailCallMaker\$(OutDir)TailCallMaker.exe&quot; &quot;$(TargetDir)$(TargetName).il&quot;&#xD;&#xA;&quot;$(TargetedFrameworkDir)\ilasm&quot; /dll /PDB /NOLOGO /QUIET /out:&quot;$(TargetDir)$(TargetName).dll&quot; /res:&quot;$(TargetDir)$(TargetName).res&quot; &quot;$(TargetDir)$(TargetName).il&quot; &quot;$(TargetDir)IronScheme.Glue.il&quot;" />
</Target>
</Project> \ No newline at end of file
diff --git a/IronScheme/IronScheme.Closures/IronScheme.Glue.il b/IronScheme/IronScheme.Closures/IronScheme.Glue.il
index fa65f0ce..44c25932 100644
--- a/IronScheme/IronScheme.Closures/IronScheme.Glue.il
+++ b/IronScheme/IronScheme.Closures/IronScheme.Glue.il
@@ -3,7 +3,6 @@
.assembly extern ironscheme.boot
{
.ver 1:0:0:0
- .publickeytoken = (78 F2 E9 D9 54 1A 0D EE)
}
diff --git a/IronScheme/IronScheme.Closures/Properties/AssemblyInfo.cs b/IronScheme/IronScheme.Closures/Properties/AssemblyInfo.cs
index a8f2f5e7..fcecafe5 100644
--- a/IronScheme/IronScheme.Closures/Properties/AssemblyInfo.cs
+++ b/IronScheme/IronScheme.Closures/Properties/AssemblyInfo.cs
@@ -7,5 +7,5 @@ using System.Runtime.InteropServices;
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
-[assembly: InternalsVisibleTo("IronScheme, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a19c436ee9130f8746aa1d1f77bd268fd66915c3c1ed59c1e493cace4a2f716640a0f2928035b40fc0111d6d2de826d2bc4fce72928e81355295a1a5157b9a9226af803976a54fcd5702526008270c3dbf8d35b101cb2468920d58b7ffe731b3e0d3729b12335a9fc769b39614f22e2ad5a8a483a0b9b29d9c7f2ecd9918c7ac")]
-[assembly: InternalsVisibleTo("ironscheme.boot, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a19c436ee9130f8746aa1d1f77bd268fd66915c3c1ed59c1e493cace4a2f716640a0f2928035b40fc0111d6d2de826d2bc4fce72928e81355295a1a5157b9a9226af803976a54fcd5702526008270c3dbf8d35b101cb2468920d58b7ffe731b3e0d3729b12335a9fc769b39614f22e2ad5a8a483a0b9b29d9c7f2ecd9918c7ac")]
+[assembly: InternalsVisibleTo("IronScheme")]
+[assembly: InternalsVisibleTo("ironscheme.boot")]
diff --git a/IronScheme/IronScheme.Console/IronScheme.Console.csproj b/IronScheme/IronScheme.Console/IronScheme.Console.csproj
index 192478a8..0f232dc3 100644
--- a/IronScheme/IronScheme.Console/IronScheme.Console.csproj
+++ b/IronScheme/IronScheme.Console/IronScheme.Console.csproj
@@ -79,7 +79,7 @@
</None>
<None Include="..\DEVELOPMENT.snk">
<Link>DEVELOPMENT.snk</Link>
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ <CopyToOutputDirectory>Never</CopyToOutputDirectory>
</None>
<None Include="ironscheme.boot.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/IronScheme/IronScheme.Console/ironscheme.boot.dll b/IronScheme/IronScheme.Console/ironscheme.boot.dll
index 16b2566f..c3132385 100644
--- a/IronScheme/IronScheme.Console/ironscheme.boot.dll
+++ b/IronScheme/IronScheme.Console/ironscheme.boot.dll
Binary files differ
diff --git a/IronScheme/IronScheme.FrameworkPAL/IronScheme.FrameworkPAL.csproj b/IronScheme/IronScheme.FrameworkPAL/IronScheme.FrameworkPAL.csproj
index 10f08817..6d1986e8 100644
--- a/IronScheme/IronScheme.FrameworkPAL/IronScheme.FrameworkPAL.csproj
+++ b/IronScheme/IronScheme.FrameworkPAL/IronScheme.FrameworkPAL.csproj
@@ -2,8 +2,6 @@
<PropertyGroup>
<TargetFrameworks>net20;netcoreapp2.1</TargetFrameworks>
- <SignAssembly>true</SignAssembly>
- <AssemblyOriginatorKeyFile>../DEVELOPMENT.snk</AssemblyOriginatorKeyFile>
<DebugType>pdbonly</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
diff --git a/IronScheme/IronScheme/IronScheme.csproj b/IronScheme/IronScheme/IronScheme.csproj
index 8a7ba64e..369efdce 100644
--- a/IronScheme/IronScheme/IronScheme.csproj
+++ b/IronScheme/IronScheme/IronScheme.csproj
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net20</TargetFrameworks>
- <SignAssembly>true</SignAssembly>
- <AssemblyOriginatorKeyFile>../DEVELOPMENT.snk</AssemblyOriginatorKeyFile>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<OutputPath>bin\$(Configuration)\</OutputPath>
</PropertyGroup>
diff --git a/IronScheme/Microsoft.Scripting/Generation/AssemblyGen.cs b/IronScheme/Microsoft.Scripting/Generation/AssemblyGen.cs
index 7f533ec0..f69412ee 100644
--- a/IronScheme/Microsoft.Scripting/Generation/AssemblyGen.cs
+++ b/IronScheme/Microsoft.Scripting/Generation/AssemblyGen.cs
@@ -113,10 +113,6 @@ namespace Microsoft.Scripting.Generation {
if (SaveAndReloadAssemblies)
{
asmname.Name = moduleName == "ironscheme.boot.new" ? "ironscheme.boot" : moduleName;
- if (File.Exists("DEVELOPMENT.snk"))
- {
- asmname.KeyPair = new StrongNameKeyPair(File.ReadAllBytes("DEVELOPMENT.snk"));
- }
asmname.Version = new Version("1.0.0.0");
var actualModuleName = moduleName == "ironscheme.boot.new" ? "ironscheme.boot.dll" : _outFileName;
diff --git a/IronScheme/Microsoft.Scripting/IronScheme.Scripting.csproj b/IronScheme/Microsoft.Scripting/IronScheme.Scripting.csproj
index f62d0ce4..384c78f5 100644
--- a/IronScheme/Microsoft.Scripting/IronScheme.Scripting.csproj
+++ b/IronScheme/Microsoft.Scripting/IronScheme.Scripting.csproj
@@ -5,8 +5,6 @@
<DocumentationFile>..\..\Bin\Release\Microsoft.Scripting.XML</DocumentationFile>
<NoWarn>1591;1734</NoWarn>
<TargetFrameworks>net20</TargetFrameworks>
- <SignAssembly>true</SignAssembly>
- <AssemblyOriginatorKeyFile>../DEVELOPMENT.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags />
<UpgradeBackupLocation />
<AssemblyTitle>Microsoft.Scripting</AssemblyTitle>
diff --git a/IronScheme/Oyster.IntX/Oyster.IntX.csproj b/IronScheme/Oyster.IntX/Oyster.IntX.csproj
index 1c0b4e09..e347d7e5 100644
--- a/IronScheme/Oyster.IntX/Oyster.IntX.csproj
+++ b/IronScheme/Oyster.IntX/Oyster.IntX.csproj
@@ -3,8 +3,6 @@
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.30729</ProductVersion>
<ApplicationIcon />
- <AssemblyKeyContainerName />
- <AssemblyOriginatorKeyFile>../DEVELOPMENT.snk</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
@@ -13,7 +11,6 @@
<StartupObject />
<FileUpgradeFlags />
<UpgradeBackupLocation />
- <SignAssembly>true</SignAssembly>
<TargetFrameworks>net20</TargetFrameworks>
<AssemblyTitle>Oyster.IntX</AssemblyTitle>
<Company>Oyster</Company>
diff --git a/IronScheme/package.cmd b/IronScheme/package.cmd
index 1c39431f..59181f53 100644
--- a/IronScheme/package.cmd
+++ b/IronScheme/package.cmd
@@ -24,7 +24,7 @@ ReferenceRemover ..\netcoreapp2.1\IronScheme.FrameworkPAL.dll "IronScheme\.Scrip
al /out:IronScheme.PALResources.dll /embed:IronScheme.FrameworkPAL.dll /embed:"..\netcoreapp2.1\IronScheme.FrameworkPAL.dll",core-IronScheme.FrameworkPAL.dll
set MERGE=ILMerge
-%MERGE% /keyfile:DEVELOPMENT.snk /out:merged\IronScheme.dll IronScheme.dll IronScheme.Closures.dll IronScheme.Scripting.dll Oyster.IntX.dll ironscheme.boot.dll IronScheme.PALResources.dll
+%MERGE% /out:merged\IronScheme.dll IronScheme.dll IronScheme.Closures.dll IronScheme.Scripting.dll Oyster.IntX.dll ironscheme.boot.dll IronScheme.PALResources.dll
copy /Y merged\IronScheme.* . >nul
peverify /nologo /ignore=0x80131820,0x801318DE,0x80131854,0x8013185D,0x80131228 IronScheme.dll >nul
@@ -52,8 +52,6 @@ ReferenceRemover install-stage\IronScheme\IronScheme.ConsoleCore.dll "IronScheme
copy ..\net5.0\IronScheme.ConsoleCore.exe install-stage\IronScheme
-copy DEVELOPMENT.snk install-stage\IronScheme
-
copy system-libraries.ss install-stage\IronScheme
copy system-libraries.srfi.ss install-stage\IronScheme