Skip to content

Commit d86f17c

Browse files
josesimoesjosesimoes
committed
Migrate mscorlib to v2
- Update and migrate pipeline files. - Update references. - Bump versions. - Replace SpanByte with Span<byte>.
1 parent 4b001b0 commit d86f17c

14 files changed

+92
-75
lines changed

‎.github/workflows/update-dependencies-develop.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Copyright (c) .NET Foundation and Contributors
2+
# See LICENSE file in the project root for full license information.
3+
4+
# This workflow will periodically check .NET nanoFramework dependencies and updates them in the repository it's running.
5+
6+
name: Daily update dependencies (develop)
7+
8+
on:
9+
schedule:
10+
# At 00:30 UTC.
11+
- cron: '20 00 * * Wed,Fri'
12+
repository_dispatch:
13+
types: update-dependencies
14+
15+
jobs:
16+
update-dependencies:
17+
name: nanoFramework
18+
uses: nanoframework/nf-tools/.github/workflows/update-dependencies.yml@main
19+
secrets: inherit
20+
with:
21+
solutionsToCheck: 'nanoFramework.System.IO.FileSystem.sln'
22+
previewPackages: true
23+
branchToPr: 'develop'
24+

System.IO.FileSystem.UnitTests/nano.runsettings renamed to .runsettings

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
<TargetPlatform>x64</TargetPlatform>
99
</RunConfiguration>
1010
<nanoFrameworkAdapter>
11-
<RealHardwarePort>COM3</RealHardwarePort><!--Specify the COM port to use to connect to a nanoDevice. If none is specified, a device detection is performed and the 1st available one will be used. -->
11+
<RealHardwarePort>COM21</RealHardwarePort><!--Specify the COM port to use to connect to a nanoDevice. If none is specified, a device detection is performed and the 1st available one will be used. -->
1212
<Logging>Verbose</Logging> <!--Set to the desired level of logging for Unit Test execution. Possible values are: None, Detailed, Verbose, Error. -->
1313
<IsRealHardware>False</IsRealHardware><!--Set to true to run tests on real hardware. -->
1414
<CLRVersion></CLRVersion><!--Specify the nanoCLR version to use. If not specified, the latest available will be used. -->
15-
<PathToLocalCLRInstance></PathToLocalCLRInstance><!--Specify the path to a local nanoCLR instance. If not specified, the default one installed with nanoclr CLR witll be used. -->
15+
<UsePreviewClr>True</UsePreviewClr>
1616
</nanoFrameworkAdapter>
17-
</RunSettings>
17+
</RunSettings>

‎System.IO.FileSystem.UnitTests/System.IO.FileSystem.UnitTests.nfproj‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@
3333
<DelaySign>false</DelaySign>
3434
</PropertyGroup>
3535
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
36-
<PropertyGroup>
37-
<RunSettingsFilePath>$(MSBuildProjectDirectory)\nano.runsettings</RunSettingsFilePath>
38-
</PropertyGroup>
3936
<ItemGroup>
4037
<Compile Include="DirectoryUnitTests.cs" />
4138
<Compile Include="FileSystemUnitTestsBase.cs" />
@@ -44,32 +41,31 @@
4441
<Compile Include="PathUnitTests.cs" />
4542
<Compile Include="Properties\AssemblyInfo.cs" />
4643
</ItemGroup>
47-
<ItemGroup>
48-
<None Include="nano.runsettings" />
49-
<None Include="packages.config" />
50-
</ItemGroup>
5144
<ItemGroup>
5245
<Content Include="packages.lock.json" />
5346
</ItemGroup>
5447
<ItemGroup>
5548
<ProjectReference Include="..\System.IO.FileSystem\System.IO.FileSystem.nfproj" />
5649
</ItemGroup>
5750
<ItemGroup>
58-
<Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
59-
<HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
51+
<Reference Include="mscorlib">
52+
<HintPath>..\packages\nanoFramework.CoreLibrary.2.0.0-preview.29\lib\netnano1.0\mscorlib.dll</HintPath>
6053
</Reference>
61-
<Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
62-
<HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
54+
<Reference Include="nanoFramework.System.Text">
55+
<HintPath>..\packages\nanoFramework.System.Text.2.0.0-preview.1\lib\nanoFramework.System.Text.dll</HintPath>
6356
</Reference>
64-
<Reference Include="nanoFramework.TestFramework, Version=3.0.77.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
65-
<HintPath>..\packages\nanoFramework.TestFramework.3.0.77\lib\nanoFramework.TestFramework.dll</HintPath>
57+
<Reference Include="nanoFramework.TestFramework">
58+
<HintPath>..\packages\nanoFramework.TestFramework.4.0.0-preview.45\lib\nanoFramework.TestFramework.dll</HintPath>
6659
</Reference>
67-
<Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
68-
<HintPath>..\packages\nanoFramework.TestFramework.3.0.77\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
60+
<Reference Include="nanoFramework.UnitTestLauncher">
61+
<HintPath>..\packages\nanoFramework.TestFramework.4.0.0-preview.45\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
6962
</Reference>
70-
<Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
71-
<HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
63+
<Reference Include="System.IO.Streams">
64+
<HintPath>..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.1\lib\System.IO.Streams.dll</HintPath>
7265
</Reference>
7366
</ItemGroup>
67+
<ItemGroup>
68+
<None Include="packages.config" />
69+
</ItemGroup>
7470
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
75-
</Project>
71+
</Project>

‎System.IO.FileSystem.UnitTests/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
4-
<package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
5-
<package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
6-
<package id="nanoFramework.TestFramework" version="3.0.77" targetFramework="netnano1.0" developmentDependency="true" />
3+
<package id="nanoFramework.CoreLibrary" version="2.0.0-preview.29" targetFramework="netnano1.0" />
4+
<package id="nanoFramework.System.IO.Streams" version="2.0.0-preview.1" targetFramework="netnano1.0" />
5+
<package id="nanoFramework.System.Text" version="2.0.0-preview.1" targetFramework="netnano1.0" />
6+
<package id="nanoFramework.TestFramework" version="4.0.0-preview.45" targetFramework="netnano1.0" developmentDependency="true" />
77
</packages>

‎System.IO.FileSystem.UnitTests/packages.lock.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@
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
"nanoFramework.System.IO.Streams": {
1212
"type": "Direct",
13-
"requested": "[1.1.96, 1.1.96]",
14-
"resolved": "1.1.96",
15-
"contentHash": "kJSy4EJwChO4Vq3vGWP9gNRPFDnTsDU5HxzeI7NDO+RjbDsx7B8EhKymoeTPLJCxQq8y/0P1KG2XCxGpggW+fw=="
13+
"requested": "[2.0.0-preview.1, 2.0.0-preview.1]",
14+
"resolved": "2.0.0-preview.1",
15+
"contentHash": "JCLDrlrh5hbmL6nlYIY+eWGvyJwN7NgU6lHJfxQ8IhDLw/B08k+iAo/KLXLB2n1bAb4b0zhGeLlJ0P1xZUyDeg=="
1616
},
1717
"nanoFramework.System.Text": {
1818
"type": "Direct",
19-
"requested": "[1.3.42, 1.3.42]",
20-
"resolved": "1.3.42",
21-
"contentHash": "68HPjhersNpssbmEMUHdMw3073MHfGTfrkbRk9eILKbNPFfPFck7m4y9BlAi6DaguUJaeKxgyIojXF3SQrF8/A=="
19+
"requested": "[2.0.0-preview.1, 2.0.0-preview.1]",
20+
"resolved": "2.0.0-preview.1",
21+
"contentHash": "+FZMSc0QPp6GbU63WXCmryKtd/zEkmH51daIV3UIV3t9CUHSg8sK7rkASVrlQ7kGYbgQl02IDbIB/r1hIK1MLw=="
2222
},
2323
"nanoFramework.TestFramework": {
2424
"type": "Direct",
25-
"requested": "[3.0.77, 3.0.77]",
26-
"resolved": "3.0.77",
27-
"contentHash": "Py5W1oN84KMBmOOHCzdz6pyi3bZTnQu9BoqIx0KGqkhG3V8kGoem/t+BuCM0pMIWAyl2iMP1n2S9624YXmBJZw=="
25+
"requested": "[4.0.0-preview.45, 4.0.0-preview.45]",
26+
"resolved": "4.0.0-preview.45",
27+
"contentHash": "QnRl5gAJW4uoH4k4oQMT+gVnI57lGnST8F/PuK31M+j0AekWFvcSHKDirWrY9rs/JJTLPwgllaKiQGioTfBwPg=="
2828
}
2929
}
3030
}

‎System.IO.FileSystem/FileStream.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ public override int Read(
421421
/// <param name="buffer">The buffer to write the data into.</param>
422422
/// <returns>The total number of bytes read into the buffer. This might be less than the number of bytes requested if that number of bytes are not currently available, or zero if the end of the stream is reached.</returns>
423423
/// <exception cref="NotImplementedException">This method is currently not implemented.</exception>
424-
public override int Read(SpanByte buffer)
424+
public override int Read(Span<byte> buffer)
425425
{
426426
throw new NotImplementedException();
427427
}

‎System.IO.FileSystem/Properties/AssemblyInfo.cs‎

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

1818
////////////////////////////////////////////////////////////////
1919
// update this whenever the native assembly signature changes //
20-
[assembly: AssemblyNativeVersion("1.1.0.4")]
20+
[assembly: AssemblyNativeVersion("100.2.0.0")]
2121
////////////////////////////////////////////////////////////////
2222

2323
[assembly: InternalsVisibleTo("NFUnitTest, PublicKey=00240000048000009400000006020000002400005253413100040000010001001120aa3e809b3da4f65e1b1f65c0a3a1bf6335c39860ca41acb3c48de278c6b63c5df38239ec1f2e32d58cb897c8c174a5f8e78a9c0b6087d3aef373d7d0f3d9be67700fc2a5a38de1fb71b5b6f6046d841ff35abee2e0b0840a6291a312be184eb311baff5fef0ff6895b9a5f2253aed32fb06b819134f6bb9d531488a87ea2")]

‎System.IO.FileSystem/System.IO.FileSystem.nfproj‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
<PropertyGroup Label="nanoFramework">
3939
<NF_GenerateStubsDirectory>bin\$(Configuration)\Stubs</NF_GenerateStubsDirectory>
4040
<NF_GenerateSkeletonProjectName>nf_sys_io_filesystem</NF_GenerateSkeletonProjectName>
41-
<Name>System.IO.FileSystem</Name>
4241
</PropertyGroup>
4342
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
4443
<ItemGroup>
@@ -73,26 +72,21 @@
7372
<ItemGroup>
7473
<None Include="packages.config" />
7574
</ItemGroup>
76-
<ItemGroup>
77-
<NFMDP_PE_ExcludeClassByName Include="ThisAssembly">
78-
<InProject>false</InProject>
79-
</NFMDP_PE_ExcludeClassByName>
80-
</ItemGroup>
8175
<ItemGroup>
8276
<Content Include="packages.lock.json" />
8377
</ItemGroup>
8478
<ItemGroup>
85-
<Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
86-
<HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
79+
<Reference Include="mscorlib">
80+
<HintPath>..\packages\nanoFramework.CoreLibrary.2.0.0-preview.29\lib\netnano1.0\mscorlib.dll</HintPath>
8781
</Reference>
88-
<Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
89-
<HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
82+
<Reference Include="nanoFramework.Runtime.Events">
83+
<HintPath>..\packages\nanoFramework.Runtime.Events.2.0.0-preview.2\lib\nanoFramework.Runtime.Events.dll</HintPath>
9084
</Reference>
91-
<Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
92-
<HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
85+
<Reference Include="nanoFramework.System.Text">
86+
<HintPath>..\packages\nanoFramework.System.Text.2.0.0-preview.1\lib\nanoFramework.System.Text.dll</HintPath>
9387
</Reference>
94-
<Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
95-
<HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
88+
<Reference Include="System.IO.Streams">
89+
<HintPath>..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.1\lib\System.IO.Streams.dll</HintPath>
9690
</Reference>
9791
</ItemGroup>
9892
<ProjectExtensions>

‎System.IO.FileSystem/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
4-
<package id="nanoFramework.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
5-
<package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
6-
<package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
3+
<package id="nanoFramework.CoreLibrary" version="2.0.0-preview.29" targetFramework="netnano1.0" />
4+
<package id="nanoFramework.Runtime.Events" version="2.0.0-preview.2" targetFramework="netnano1.0" />
5+
<package id="nanoFramework.System.IO.Streams" version="2.0.0-preview.1" targetFramework="netnano1.0" />
6+
<package id="nanoFramework.System.Text" version="2.0.0-preview.1" targetFramework="netnano1.0" />
77
<package id="Nerdbank.GitVersioning" version="3.9.50" developmentDependency="true" targetFramework="netnano1.0" />
88
</packages>

‎System.IO.FileSystem/packages.lock.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@
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
"nanoFramework.Runtime.Events": {
1212
"type": "Direct",
13-
"requested": "[1.11.32, 1.11.32]",
14-
"resolved": "1.11.32",
15-
"contentHash": "NyLUIwJDlpl5VKSd+ljmdDtO2WHHBvPvruo1ccaL+hd79z+6XMYze1AccOVXKGiZenLBCwDmFHwpgIQyHkM7GA=="
13+
"requested": "[2.0.0-preview.2, 2.0.0-preview.2]",
14+
"resolved": "2.0.0-preview.2",
15+
"contentHash": "2R3UXwVl5UqO9vMtcfUbffQd2bbMTwqHqYgzRKT5Cwh87ZhkCcN2vWDBnFEBdXb92PNocEz/SpeocqqkeYulIw=="
1616
},
1717
"nanoFramework.System.IO.Streams": {
1818
"type": "Direct",
19-
"requested": "[1.1.96, 1.1.96]",
20-
"resolved": "1.1.96",
21-
"contentHash": "kJSy4EJwChO4Vq3vGWP9gNRPFDnTsDU5HxzeI7NDO+RjbDsx7B8EhKymoeTPLJCxQq8y/0P1KG2XCxGpggW+fw=="
19+
"requested": "[2.0.0-preview.1, 2.0.0-preview.1]",
20+
"resolved": "2.0.0-preview.1",
21+
"contentHash": "JCLDrlrh5hbmL6nlYIY+eWGvyJwN7NgU6lHJfxQ8IhDLw/B08k+iAo/KLXLB2n1bAb4b0zhGeLlJ0P1xZUyDeg=="
2222
},
2323
"nanoFramework.System.Text": {
2424
"type": "Direct",
25-
"requested": "[1.3.42, 1.3.42]",
26-
"resolved": "1.3.42",
27-
"contentHash": "68HPjhersNpssbmEMUHdMw3073MHfGTfrkbRk9eILKbNPFfPFck7m4y9BlAi6DaguUJaeKxgyIojXF3SQrF8/A=="
25+
"requested": "[2.0.0-preview.1, 2.0.0-preview.1]",
26+
"resolved": "2.0.0-preview.1",
27+
"contentHash": "+FZMSc0QPp6GbU63WXCmryKtd/zEkmH51daIV3UIV3t9CUHSg8sK7rkASVrlQ7kGYbgQl02IDbIB/r1hIK1MLw=="
2828
},
2929
"Nerdbank.GitVersioning": {
3030
"type": "Direct",

0 commit comments

Comments
 (0)