Skip to content

Commit 163a029

Browse files
josesimoesjosesimoes
authored
Work CI-CD (#29)
***NO_CI***
1 parent 87813f4 commit 163a029

File tree

11 files changed

+91
-39
lines changed

11 files changed

+91
-39
lines changed

‎.github/workflows/pr-checks.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Copyright (c) .NET Foundation and Contributors
2+
# See LICENSE file in the project root for full license information.
3+
4+
name: PR Checks
5+
6+
on:
7+
pull_request:
8+
9+
jobs:
10+
check_package_lock:
11+
name: nanoFramework
12+
uses: nanoframework/nf-tools/.github/workflows/check-package-lock.yml@main
13+
check_nuget_latest:
14+
name: nanoFramework
15+
uses: nanoframework/nf-tools/.github/workflows/check-packages-updated.yml@main
16+
with:
17+
solution: 'nanoFramework.System.Text.RegularExpressions.sln'

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

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,16 @@ name: Daily update dependencies
77

88
on:
99
schedule:
10-
# Update At 00:00 UTC on Tuesday and Friday
11-
- cron: '0 0 * * 2,5'
10+
# At 00:00 UTC every day.
11+
- cron: '00 00 * * *'
1212
repository_dispatch:
1313
types: update-dependencies
1414

15-
defaults:
16-
run:
17-
shell: pwsh
18-
1915
jobs:
20-
update-nuget-dependencies:
21-
name: Update .NET nanoFramework dependencies
22-
timeout-minutes: 180 # Non default as IoT devices has lots of solutions to update!
23-
runs-on: windows-latest
24-
env:
25-
GITHUB_TOKEN: ${{ github.token }}
26-
steps:
27-
- name: Checkout
28-
uses: actions/checkout@v2
29-
- name: Update dependencies
30-
uses: nanoframework/nanodu@v1
31-
with:
32-
solutionsToCheck: 'nanoFramework.System.Text.RegularExpressions.sln'
16+
update-dependencies:
17+
name: nanoFramework
18+
uses: nanoframework/nf-tools/.github/workflows/update-dependencies.yml@main
19+
with:
20+
solutionsToCheck: 'nanoFramework.System.Text.RegularExpressions.sln'
21+
secrets:
22+
githubAuth: ${{ secrets.NFBOT_GITHUB_ACTIONS }}

‎Tests/NFUnitTestRegex/nano.runsettings‎ renamed to ‎.runsettings‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<MaxCpuCount>1</MaxCpuCount>
66
<ResultsDirectory>.\TestResults</ResultsDirectory><!-- Path relative to solution directory -->
77
<TestSessionTimeout>120000</TestSessionTimeout><!-- Milliseconds -->
8-
<TargetFrameworkVersion>Framework40</TargetFrameworkVersion>
8+
<TargetFrameworkVersion>net48</TargetFrameworkVersion>
9+
<TargetPlatform>x64</TargetPlatform>
910
</RunConfiguration>
1011
<nanoFrameworkAdapter>
1112
<Logging>None</Logging>

‎Tests/NFUnitTestRegex/NFUnitTestRegex.nfproj‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@
2121
<IsTestProject>true</IsTestProject>
2222
<TestProjectType>UnitTest</TestProjectType>
2323
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
24+
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
25+
<RestoreLockedMode Condition="'$(TF_BUILD)' == 'True' or '$(ContinuousIntegrationBuild)' == 'True'">true</RestoreLockedMode>
2426
</PropertyGroup>
2527
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
26-
<PropertyGroup>
27-
<RunSettingsFilePath>$(MSBuildProjectDirectory)\nano.runsettings</RunSettingsFilePath>
28-
</PropertyGroup>
2928
<ItemGroup>
3029
<Compile Include="ComplexExpressionsTests.cs" />
3130
<Compile Include="GroupTests.cs" />
@@ -42,19 +41,15 @@
4241
<ItemGroup>
4342
<Reference Include="mscorlib, Version=1.12.0.4, Culture=neutral, PublicKeyToken=c07d481e9758c731">
4443
<HintPath>..\..\packages\nanoFramework.CoreLibrary.1.12.0\lib\mscorlib.dll</HintPath>
45-
<Private>True</Private>
4644
</Reference>
4745
<Reference Include="nanoFramework.TestFramework, Version=2.0.43.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
4846
<HintPath>..\..\packages\nanoFramework.TestFramework.2.0.43\lib\nanoFramework.TestFramework.dll</HintPath>
49-
<Private>True</Private>
5047
</Reference>
5148
<Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
5249
<HintPath>..\..\packages\nanoFramework.TestFramework.2.0.43\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
53-
<Private>True</Private>
5450
</Reference>
5551
</ItemGroup>
5652
<ItemGroup>
57-
<None Include="nano.runsettings" />
5853
<None Include="packages.config" />
5954
</ItemGroup>
6055
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />

‎Tests/NFUnitTestRegex/packages.config‎

Lines changed: 2 additions & 2 deletions
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.12.0" targetFramework="netnanoframework10" />
4-
<package id="nanoFramework.TestFramework" version="2.0.43" targetFramework="netnanoframework10" developmentDependency="true" />
3+
<package id="nanoFramework.CoreLibrary" version="1.12.0" targetFramework="netnano1.0" />
4+
<package id="nanoFramework.TestFramework" version="2.0.43" targetFramework="netnano1.0" developmentDependency="true" />
55
</packages>

‎Tests/NFUnitTestRegex/packages.lock.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"version": 1,
3+
"dependencies": {
4+
".NETnanoFramework,Version=v1.0": {
5+
"nanoFramework.CoreLibrary": {
6+
"type": "Direct",
7+
"requested": "[1.12.0, 1.12.0]",
8+
"resolved": "1.12.0",
9+
"contentHash": "qQrFNXmJiStMC4VXk5cVMOJp23/qlT9FW5i9i+igwQVwraQTtvpkam8yK1hj992jqrbjoCIFZP4Hw9E8H0pB7w=="
10+
},
11+
"nanoFramework.TestFramework": {
12+
"type": "Direct",
13+
"requested": "[2.0.43, 2.0.43]",
14+
"resolved": "2.0.43",
15+
"contentHash": "HNsLJa/ZMK41A+86siZJUelZTeYWKdFm4M8tpcvtmyU52FSvBsciVJchgtgmM7XXe6A8YhT71PU1ZIV03EVmEQ=="
16+
}
17+
}
18+
}
19+
}

‎azure-pipelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ steps:
5050
parameters:
5151
sonarCloudProject: 'nanoframework_lib-nanoFramework.System.Text.RegularExpressions'
5252
runUnitTests: true
53-
unitTestRunsettings: '$(System.DefaultWorkingDirectory)\Tests\NFUnitTestRegex\nano.runsettings'
53+
unitTestRunsettings: '$(System.DefaultWorkingDirectory)\.runsettings'
5454

5555
# step from template @ nf-tools repo
5656
# report error

‎nanoFramework.System.Text.RegularExpressions.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
44
<id>nanoFramework.System.Text.RegularExpressions</id>
55
<version>$version$</version>
66
<title>nanoFramework.System.Text.RegularExpressions</title>
7-
<authors>nanoFramework</authors>
7+
<authors>nanoframework</authors>
88
<requireLicenseAcceptance>false</requireLicenseAcceptance>
99
<license type="file">LICENSE.md</license>
1010
<releaseNotes>

‎nanoFramework.System.Text.RegularExpressions/nanoFramework.System.text.RegularExpressions.nfproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
1919
<NF_IsCoreLibrary>True</NF_IsCoreLibrary>
2020
<DocumentationFile>bin\$(Configuration)\System.Text.RegularExpressions.xml</DocumentationFile>
21+
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
22+
<RestoreLockedMode Condition="'$(TF_BUILD)' == 'True' or '$(ContinuousIntegrationBuild)' == 'True'">true</RestoreLockedMode>
2123
</PropertyGroup>
2224
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
2325
<ItemGroup>
@@ -60,15 +62,12 @@
6062
<ItemGroup>
6163
<Reference Include="mscorlib, Version=1.12.0.4, Culture=neutral, PublicKeyToken=c07d481e9758c731">
6264
<HintPath>..\packages\nanoFramework.CoreLibrary.1.12.0\lib\mscorlib.dll</HintPath>
63-
<Private>True</Private>
6465
</Reference>
6566
<Reference Include="nanoFramework.System.Collections, Version=1.4.0.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
6667
<HintPath>..\packages\nanoFramework.System.Collections.1.4.0\lib\nanoFramework.System.Collections.dll</HintPath>
67-
<Private>True</Private>
6868
</Reference>
6969
<Reference Include="nanoFramework.System.Text, Version=1.2.7.60109, Culture=neutral, PublicKeyToken=c07d481e9758c731">
7070
<HintPath>..\packages\nanoFramework.System.Text.1.2.7\lib\nanoFramework.System.Text.dll</HintPath>
71-
<Private>True</Private>
7271
</Reference>
7372
</ItemGroup>
7473
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />

‎nanoFramework.System.Text.RegularExpressions/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.12.0" targetFramework="netnanoframework10" />
4-
<package id="nanoFramework.System.Collections" version="1.4.0" targetFramework="netnanoframework10" />
5-
<package id="nanoFramework.System.Text" version="1.2.7" targetFramework="netnanoframework10" />
6-
<package id="Nerdbank.GitVersioning" version="3.5.113" developmentDependency="true" targetFramework="netnanoframework10" />
3+
<package id="nanoFramework.CoreLibrary" version="1.12.0" targetFramework="netnano1.0" />
4+
<package id="nanoFramework.System.Collections" version="1.4.0" targetFramework="netnano1.0" />
5+
<package id="nanoFramework.System.Text" version="1.2.7" targetFramework="netnano1.0" />
6+
<package id="Nerdbank.GitVersioning" version="3.5.113" developmentDependency="true" targetFramework="netnano1.0" />
77
</packages>

0 commit comments

Comments
 (0)