Skip to content

Commit 19a4363

Browse files
committed
Work CI-CD
- Rework runsettings for Unit tests. - Update target framework. ***NO_CI***
1 parent 8967adb commit 19a4363

File tree

6 files changed

+4
-7
lines changed

6 files changed

+4
-7
lines changed
File renamed without changes.

System.IO.Streams/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="nanoFramework.CoreLibrary" version="1.12.0" targetFramework="netnanoframework10" />
3+
<package id="nanoFramework.CoreLibrary" version="1.12.0" targetFramework="netnano1.0" />
44
<package id="nanoFramework.System.Text" version="1.2.22" targetFramework="netnano1.0" />
55
<package id="Nerdbank.GitVersioning" version="3.5.119" developmentDependency="true" targetFramework="netnano1.0" />
66
</packages>

UnitTests/MemoryStreamUnitTests/MemoryStreamUnitTests.nfproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
<RestoreLockedMode Condition="'$(TF_BUILD)' == 'True' or '$(ContinuousIntegrationBuild)' == 'True'">true</RestoreLockedMode>
2626
</PropertyGroup>
2727
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
28-
<PropertyGroup>
29-
<RunSettingsFilePath>$(MSBuildProjectDirectory)\nano.runsettings</RunSettingsFilePath>
30-
</PropertyGroup>
3128
<ItemGroup>
3229
<Compile Include="WriteByte.cs" />
3330
<Compile Include="Write.cs" />
@@ -67,7 +64,6 @@
6764
</Reference>
6865
</ItemGroup>
6966
<ItemGroup>
70-
<None Include="nano.runsettings" />
7167
<None Include="packages.config" />
7268
</ItemGroup>
7369
<ItemGroup>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="nanoFramework.CoreLibrary" version="1.12.0" targetFramework="netnanoframework10" />
3+
<package id="nanoFramework.CoreLibrary" version="1.12.0" targetFramework="netnano1.0" />
44
<package id="nanoFramework.System.Text" version="1.2.22" targetFramework="netnano1.0" />
55
<package id="nanoFramework.TestFramework" version="2.0.60" targetFramework="netnano1.0" developmentDependency="true" />
66
</packages>

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
parameters:
6060
sonarCloudProject: 'nanoframework_System.IO.Streams'
6161
runUnitTests: true
62-
unitTestRunsettings: '$(System.DefaultWorkingDirectory)\UnitTests\MemoryStreamUnitTests\nano.runsettings'
62+
unitTestRunsettings: '$(System.DefaultWorkingDirectory)\.runsettings'
6363

6464
##############################
6565
- job: Update_Dependencies

nanoFramework.System.IO.Streams.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "MemoryStreamUnitTests", "Un
1111
EndProject
1212
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DAA42459-BABD-422B-9EAB-D98EECCFDDF4}"
1313
ProjectSection(SolutionItems) = preProject
14+
.runsettings = .runsettings
1415
nanoFramework.System.IO.Streams.nuspec = nanoFramework.System.IO.Streams.nuspec
1516
NuGet.Config = NuGet.Config
1617
version.json = version.json

0 commit comments

Comments
 (0)