From 4911d27353a95e7a98bc86b83e031cf8eac270cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Fri, 27 May 2022 13:19:21 +0100 Subject: [PATCH] Update dependencies (#156) ***NO_CI*** --- azure-pipelines.yml | 4 +--- nanoFramework.TestAdapter.sln | 12 ++++++------ nanoFramework.TestFramework.sln | 11 +++++------ source/TestAdapter/Directory.Build.props | 2 +- source/TestAdapter/nanoFramework.TestAdapter.csproj | 4 ++-- .../TestFramework/nanoFramework.TestFramework.nfproj | 6 +++--- source/TestFramework/packages.config | 2 +- 7 files changed, 19 insertions(+), 22 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8dc31d5..70efac5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -98,8 +98,6 @@ jobs: buildConfiguration: 'Release' steps: - - # need this here in order to persist GitHub credentials, do a shallow fetch AND init submodules - checkout: self - script: | @@ -113,7 +111,7 @@ jobs: condition: ne( variables['StartReleaseCandidate'], true ) displayName: Install nanoFramework MSBuild components env: - GITHUB_TOKEN: $(GitHubToken) + GITHUB_TOKEN: $(GITHUB_TOKEN) - task: NuGetCommand@2 displayName: NuGet restore Test Adapter diff --git a/nanoFramework.TestAdapter.sln b/nanoFramework.TestAdapter.sln index 0dd985b..f2612c7 100644 --- a/nanoFramework.TestAdapter.sln +++ b/nanoFramework.TestAdapter.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31005.135 +# Visual Studio Version 17 +VisualStudioVersion = 17.2.32519.379 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nanoFramework.TestAdapter", "source\TestAdapter\nanoFramework.TestAdapter.csproj", "{7B3026CA-1CBB-4F28-AC42-29CD22710877}" EndProject @@ -16,10 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProjectSection EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - source\TestFrameworkShared\TestFrameworkShared.projitems*{55f048b5-6739-43c5-a93d-db61db8e912f}*SharedItemsImports = 13 - source\TestFrameworkShared\TestFrameworkShared.projitems*{7b3026ca-1cbb-4f28-ac42-29cd22710877}*SharedItemsImports = 5 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU @@ -36,4 +32,8 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8DC0B70D-F42F-4257-A336-60E93BE828D2} EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + source\TestFrameworkShared\TestFrameworkShared.projitems*{55f048b5-6739-43c5-a93d-db61db8e912f}*SharedItemsImports = 13 + source\TestFrameworkShared\TestFrameworkShared.projitems*{7b3026ca-1cbb-4f28-ac42-29cd22710877}*SharedItemsImports = 5 + EndGlobalSection EndGlobal diff --git a/nanoFramework.TestFramework.sln b/nanoFramework.TestFramework.sln index c187fba..f84c2e2 100644 --- a/nanoFramework.TestFramework.sln +++ b/nanoFramework.TestFramework.sln @@ -1,7 +1,6 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31005.135 +# Visual Studio Version 17 +VisualStudioVersion = 17.2.32519.379 MinimumVisualStudioVersion = 10.0.40219.1 Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "nanoFramework.UnitTestLauncher", "source\UnitTestLauncher\nanoFramework.UnitTestLauncher.nfproj", "{897FC4EA-823D-4343-8CC6-B6F28C3FF91E}" EndProject @@ -10,9 +9,6 @@ EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TestFrameworkShared", "source\TestFrameworkShared\TestFrameworkShared.shproj", "{55F048B5-6739-43C5-A93D-DB61DB8E912F}" EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - source\TestFrameworkShared\TestFrameworkShared.projitems*{55f048b5-6739-43c5-a93d-db61db8e912f}*SharedItemsImports = 13 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU @@ -37,4 +33,7 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {45FCB25A-0B73-4A11-B3AC-29A48E46AB9C} EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + source\TestFrameworkShared\TestFrameworkShared.projitems*{55f048b5-6739-43c5-a93d-db61db8e912f}*SharedItemsImports = 13 + EndGlobalSection EndGlobal diff --git a/source/TestAdapter/Directory.Build.props b/source/TestAdapter/Directory.Build.props index ba7d05e..9c64ceb 100644 --- a/source/TestAdapter/Directory.Build.props +++ b/source/TestAdapter/Directory.Build.props @@ -2,7 +2,7 @@ - 3.5.104 + 3.5.107 all diff --git a/source/TestAdapter/nanoFramework.TestAdapter.csproj b/source/TestAdapter/nanoFramework.TestAdapter.csproj index abea331..99b588e 100644 --- a/source/TestAdapter/nanoFramework.TestAdapter.csproj +++ b/source/TestAdapter/nanoFramework.TestAdapter.csproj @@ -11,13 +11,13 @@ - 1.8.0.58 + 1.8.0.179 runtime; build; native; contentfiles; analyzers; buildtransitive all - 3.5.104 + 3.5.107 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/source/TestFramework/nanoFramework.TestFramework.nfproj b/source/TestFramework/nanoFramework.TestFramework.nfproj index 56cd57f..8f449e9 100644 --- a/source/TestFramework/nanoFramework.TestFramework.nfproj +++ b/source/TestFramework/nanoFramework.TestFramework.nfproj @@ -51,11 +51,11 @@ - + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}. - + - + \ No newline at end of file diff --git a/source/TestFramework/packages.config b/source/TestFramework/packages.config index b2f8004..b02c43b 100644 --- a/source/TestFramework/packages.config +++ b/source/TestFramework/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file