Skip to content

Commit 8f7b4c5

Browse files
committed
Migrate mscorlib to v2
- Update pipeline configs and helpers. - Update references. - Bump versions. - Update nuspec.
1 parent c7a7cd0 commit 8f7b4c5

File tree

7 files changed

+10
-9
lines changed

7 files changed

+10
-9
lines changed

System.Device.Adc/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
////////////////////////////////////////////////////////////////
1414
// update this whenever the native assembly signature changes //
15-
[assembly: AssemblyNativeVersion("100.0.0.0")]
15+
[assembly: AssemblyNativeVersion("100.2.0.0")]
1616
////////////////////////////////////////////////////////////////
1717

1818
// Setting ComVisible to false makes the types in this assembly not visible

System.Device.Adc/System.Device.Adc.nfproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
<None Include="packages.config" />
5454
</ItemGroup>
5555
<ItemGroup>
56-
<Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
57-
<HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
56+
<Reference Include="mscorlib">
57+
<HintPath>..\packages\nanoFramework.CoreLibrary.2.0.0-preview.29\lib\netnano1.0\mscorlib.dll</HintPath>
5858
</Reference>
5959
</ItemGroup>
6060
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />

System.Device.Adc/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
3+
<package id="nanoFramework.CoreLibrary" version="2.0.0-preview.29" targetFramework="netnano1.0" />
44
<package id="Nerdbank.GitVersioning" version="3.9.50" developmentDependency="true" targetFramework="netnano1.0" />
55
</packages>

System.Device.Adc/packages.lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
".NETnanoFramework,Version=v1.0": {
55
"nanoFramework.CoreLibrary": {
66
"type": "Direct",
7-
"requested": "[1.17.11, 1.17.11]",
8-
"resolved": "1.17.11",
9-
"contentHash": "HezzAc0o2XrSGf85xSeD/6xsO6ohF9hX6/iMQ1IZS6Zw6umr4WfAN2Jv0BrPxkaYwzEegJxxZujkHoUIAqtOMw=="
7+
"requested": "[2.0.0-preview.29, 2.0.0-preview.29]",
8+
"resolved": "2.0.0-preview.29",
9+
"contentHash": "7NDp9Sda9FTFBDN//X34r23rJBHUkCvyGvrFh9s5B8H2nMoet4J0OlEOiZRUsEPBXlsNpZFVp+Cd6OSjnLSg5A=="
1010
},
1111
"Nerdbank.GitVersioning": {
1212
"type": "Direct",

azure-pipelines.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ steps:
5959
- template: azure-pipelines-templates/class-lib-build.yml@templates
6060
parameters:
6161
sonarCloudProject: 'nanoframework_System.Device.Adc'
62+
usePreviewBuild: true
6263

6364
# step from template @ nf-tools repo
6465
# report error

nanoframework.System.Device.Adc.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
This package requires a target with System.Device.Adc v$nativeVersion$ (checksum $checksum$).</description>
2020
<tags>nanoFramework C# csharp netmf netnf adc</tags>
2121
<dependencies>
22-
<dependency id="nanoFramework.CoreLibrary" version="1.17.11" />
22+
<dependency id="nanoFramework.CoreLibrary" version="2.0.0-preview.29" />
2323
</dependencies>
2424
</metadata>
2525
<files>

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "1.1",
3+
"version": "2.0.0-preview.{height}",
44
"assemblyVersion": {
55
"precision": "revision"
66
},

0 commit comments

Comments
 (0)