Skip to content

Commit 1c38b18

Browse files
authored
Move to new assembly format (#281)
1 parent 152f9d3 commit 1c38b18

6 files changed

Lines changed: 6 additions & 48 deletions

File tree

‎Tests/TestFramework/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,3 @@
3333
// [assembly: AssemblyVersion("1.0.*")]
3434
[assembly: AssemblyVersion("1.0.0.0")]
3535
[assembly: AssemblyFileVersion("1.0.0.0")]
36-
37-
/////////////////////////////////////////////////////////////////
38-
// This attribute is mandatory when building Interop libraries //
39-
// update this whenever the native assembly signature changes //
40-
[assembly: AssemblyNativeVersion("1.0.0.0")]
41-
/////////////////////////////////////////////////////////////////

‎azure-pipelines.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
skipNuGetCache: false
9595
usePreviewBuild: true
9696

97-
# rebuild CoreLibrary project to get the assembly checksum
97+
# rebuild CoreLibrary project to get the native contract hash
9898
- task: MSBuild@1
9999
condition: >-
100100
and(
@@ -115,7 +115,7 @@ jobs:
115115
parameters:
116116
nugetPackageName: 'nanoFramework.CoreLibrary'
117117

118-
# rebuild CoreLibrary.NoReflection project to get the assembly checksum
118+
# rebuild CoreLibrary.NoReflection project to get the native contract hash
119119
- task: MSBuild@1
120120
condition: >-
121121
and(

‎nanoFramework.CoreLibrary.NoReflection.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<icon>images\nf-logo.png</icon>
1515
<repository type="git" url="https://github.com/nanoframework/CoreLibrary" commit="$commit$" />
1616
<copyright>Copyright (c) .NET Foundation and Contributors</copyright>
17-
<description>This package includes the CoreLibrary assembly for .NET nanoFramework C# projects **WITHOUT** the System.Reflection API.&#10;This package requires a target with mscorlib v$nativeVersion$ (checksum $checksum$).&#10;There is another version that includes the System.Reflection API.</description>
18-
<tags>nanoFramework C# csharp netmf netnf nanoFramework.CoreLibrary</tags>
17+
<description>This package includes the CoreLibrary assembly for .NET nanoFramework C# projects **WITHOUT** the System.Reflection API.&#10;This package requires a target with mscorlib native contract hash $nativeContractHash$.&#10;There is another version that includes the System.Reflection API.</description>
18+
<tags>nanoFramework C# csharp netmf netnf nanoFramework.CoreLibrary nfnc-$nativeContractHash$</tags>
1919
</metadata>
2020
<files>
2121
<file src="nanoFramework.CoreLibrary.NoReflection\bin\Release\mscorlib.dll" target="lib\mscorlib.dll" />

‎nanoFramework.CoreLibrary.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<icon>images\nf-logo.png</icon>
1515
<repository type="git" url="https://github.com/nanoframework/CoreLibrary" commit="$commit$" />
1616
<copyright>Copyright (c) .NET Foundation and Contributors</copyright>
17-
<description>This package includes the CoreLibrary assembly for .NET nanoFramework C# projects.&#10;This package requires a target with mscorlib v$nativeVersion$ (checksum $checksum$).&#10;In case you don't need the System.Reflection API there is another NuGet package without this API.</description>
18-
<tags>nanoFramework C# csharp netmf netnf nanoFramework.CoreLibrary</tags>
17+
<description>This package includes the CoreLibrary assembly for .NET nanoFramework C# projects.&#10;This package requires a target with mscorlib native contract hash $nativeContractHash$.&#10;In case you don't need the System.Reflection API there is another NuGet package without this API.</description>
18+
<tags>nanoFramework C# csharp netmf netnf nanoFramework.CoreLibrary nfnc-$nativeContractHash$</tags>
1919
</metadata>
2020
<files>
2121
<file src="nanoFramework.CoreLibrary\bin\Release\mscorlib.*" target="lib\netnano1.0" />

‎nanoFramework.CoreLibrary/System/AssemblyInfo.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,3 @@
99
[assembly: AssemblyCompany(".NET nanoFramework Contributors")]
1010
[assembly: AssemblyProduct(".NET nanoFramework mscorlib")]
1111
[assembly: AssemblyCopyright("Copyright (c) .NET Foundation and Contributors")]
12-
13-
[assembly: AssemblyNativeVersion("100.22.0.5")]

‎nanoFramework.CoreLibrary/System/Reflection/AssemblyAttributes.cs‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -235,38 +235,4 @@ public String Version
235235
get { return _version; }
236236
}
237237
}
238-
239-
/// <summary>
240-
/// Defines the required native version required for an assembly.
241-
/// At deploy time this is used to check if the target device has the correct native version to support this assembly.
242-
/// </summary>
243-
/// <remarks>
244-
/// This attribute is specific of nanoFramework.
245-
/// </remarks>
246-
[AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class, Inherited = false)]
247-
[ExcludeType]
248-
public sealed class AssemblyNativeVersionAttribute : Attribute
249-
{
250-
private readonly String _nativeVersion;
251-
252-
/// <summary>
253-
/// Initializes a new instance of the AssemblyNativeVersionAttribute class.
254-
/// </summary>
255-
/// <param name="version">The native version required for the assembly.</param>
256-
public AssemblyNativeVersionAttribute(String version)
257-
{
258-
_nativeVersion = version;
259-
}
260-
261-
/// <summary>
262-
/// Gets the native version required for the assembly.
263-
/// </summary>
264-
/// <value>
265-
/// A string containing the native version.
266-
/// </value>
267-
public String NativeVersion
268-
{
269-
get { return _nativeVersion; }
270-
}
271-
}
272238
}

0 commit comments

Comments
 (0)