From 8100490ebb3d215c0aafc6441b1eb8858dcad6a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Fri, 10 Jul 2020 02:28:16 +0100 Subject: [PATCH] Work CD-CI (#39) --- source/NuGet.Config => NuGet.Config | 0 azure-pipelines.yml | 57 +++++++++---------- ...wareFlasher.sln => nanoFirmwareFlasher.sln | 0 .../BintrayPackageInfo.cs | 0 .../CC13x26x2Device.cs | 0 .../CC13x26x2Firmware.cs | 0 .../CC13x26x2Operations.cs | 0 .../Esp32Firmware.cs | 0 .../Esp32Operations.cs | 0 .../EspTool.cs | 0 .../BadDfuProtocolVersionException.cs | 0 .../CantConnectToJtagDeviceException.cs | 0 .../Exceptions/CantOpenDfuDeviceException.cs | 0 .../CantReadDfuDescriptorException.cs | 0 .../CantReadUsbDescriptorException.cs | 0 .../DfuFileDoesNotExistException.cs | 0 .../DfuVerificationFailedException.cs | 0 .../Exceptions/EraseEsp32FlashException.cs | 0 .../Exceptions/EspToolExecutionException.cs | 0 .../Exceptions/ReadEsp32FlashException.cs | 0 .../Exceptions/StLinkCliExecutionException.cs | 0 .../UniflashCliExecutionException.cs | 0 .../Exceptions/WriteEsp32FlashException.cs | 0 .../ExitCodes.cs | 0 .../Extensions/AttributeExtensions.cs | 0 .../Extensions/CommandLineExtensions.cs | 0 .../FirmwarePackage.cs | 0 .../Options.cs | 0 .../Program.cs | 0 .../StDfu.cs | 0 .../Stm32Firmware.cs | 0 .../Stm32Operations.cs | 0 .../StmDfuDevice.cs | 0 .../StmJtagDevice.cs | 0 .../UPDATE ESPTOOL.txt | 0 .../nanoFirmwareFlasher.csproj | 8 +-- .../update_esptool.ps1 | 0 source/version.json => version.json | 0 38 files changed, 31 insertions(+), 34 deletions(-) rename source/NuGet.Config => NuGet.Config (100%) rename source/nanoFirmwareFlasher.sln => nanoFirmwareFlasher.sln (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/BintrayPackageInfo.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/CC13x26x2Device.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/CC13x26x2Firmware.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/CC13x26x2Operations.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/Esp32Firmware.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/Esp32Operations.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/EspTool.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/Exceptions/BadDfuProtocolVersionException.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/Exceptions/CantConnectToJtagDeviceException.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/Exceptions/CantOpenDfuDeviceException.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/Exceptions/CantReadDfuDescriptorException.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/Exceptions/CantReadUsbDescriptorException.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/Exceptions/DfuFileDoesNotExistException.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/Exceptions/DfuVerificationFailedException.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/Exceptions/EraseEsp32FlashException.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/Exceptions/EspToolExecutionException.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/Exceptions/ReadEsp32FlashException.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/Exceptions/StLinkCliExecutionException.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/Exceptions/UniflashCliExecutionException.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/Exceptions/WriteEsp32FlashException.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/ExitCodes.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/Extensions/AttributeExtensions.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/Extensions/CommandLineExtensions.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/FirmwarePackage.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/Options.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/Program.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/StDfu.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/Stm32Firmware.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/Stm32Operations.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/StmDfuDevice.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/StmJtagDevice.cs (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/UPDATE ESPTOOL.txt (100%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/nanoFirmwareFlasher.csproj (85%) rename {source/nanoFirmwareFlasher => nanoFirmwareFlasher}/update_esptool.ps1 (100%) rename source/version.json => version.json (100%) diff --git a/source/NuGet.Config b/NuGet.Config similarity index 100% rename from source/NuGet.Config rename to NuGet.Config diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 67ad272d..6b226850 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -71,7 +71,7 @@ jobs: # prepare release and capture output Write-Host "Prepare release with NBGV..." - $release = nbgv prepare-release -p source + $release = nbgv prepare-release Write-Host "Prepare commit..." # get commit message for the merge @@ -121,7 +121,7 @@ jobs: ########################################################### # build tool - job: Build_tool - condition: not( eq( dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true ) ) + condition: ne( dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true ) dependsOn: - Check_Build_Options @@ -146,35 +146,34 @@ jobs: displayName: Setup git identity - task: NuGetToolInstaller@0 - inputs: - versionSpec: '4.9.3' displayName: 'Install specifc version of NuGet' + inputs: + versionSpec: '5.4.0' - task: UseDotNet@2 + displayName: Install .NET Core SDK inputs: packageType: sdk version: 3.1.101 - displayName: Install .NET Core SDK - task: DotNetCoreCLI@2 + displayName: Restore NuGet packages inputs: command: restore - verbosityRestore: minimal # detailed, normal, minimal - projects: source\nanoFirmwareFlasher.sln + verbosityRestore: minimal + projects: nanoFirmwareFlasher.sln feedsToUse: config - nugetConfigPath: source/NuGet.Config - workingDirectory: source - displayName: Restore NuGet packages + nugetConfigPath: NuGet.Config - script: dotnet build -r win-x64 -c $(BuildConfiguration) /p:PublicRelease=true --no-restore /t:build,pack - workingDirectory: source displayName: Build NuGet package - script: dotnet pack --runtime win-x64 -c $(BuildConfiguration) -p:PublicRelease=true -p:PackGlobalTool=true --no-restore - workingDirectory: source displayName: Build .NET Core Tool NuGet package - task: PowerShell@2 + condition: succeeded() + displayName: Get NuGet build number inputs: targetType: 'inline' script: | @@ -189,16 +188,14 @@ jobs: Write-Host "NuGet build number is $MyNuGetVersion" Write-Host "$("##vso[task.setvariable variable=MY_NUGET_VERSION]")$MyNuGetVersion" - condition: succeeded() - displayName: Get NuGet build number # update could build number (only possible if this is not a PR from a fork) - task: PowerShell@2 + condition: and( succeeded(), ne(variables['system.pullrequest.isfork'], true) ) + displayName: Update cloud build number inputs: targetType: 'inline' script: Write-Host "$("##vso[build.updatebuildnumber]")$env:NBGV_NuGetPackageVersion" - condition: and( succeeded(), ne(variables['system.pullrequest.isfork'], true) ) - displayName: Update cloud build number - powershell: | # get subject and commit message for commit @@ -223,49 +220,51 @@ jobs: displayName: set release draft var - task: CopyFiles@1 + condition: succeeded() + displayName: Collecting deployable artifacts inputs: sourceFolder: $(Build.SourcesDirectory) Contents: | **\*.nupkg TargetFolder: '$(Build.ArtifactStagingDirectory)' flattenFolders: true - condition: succeeded() - displayName: Collecting deployable artifacts # publish artifacts (only possible if this is not a PR originated on a fork) - task: PublishBuildArtifacts@1 + condition: and( succeeded(), ne(variables['system.pullrequest.isfork'], true) ) + displayName: Publish deployables artifacts inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)' ArtifactName: deployables ArtifactType: Container - condition: and( succeeded(), ne(variables['system.pullrequest.isfork'], true) ) - displayName: Publish deployables artifacts # push NuGet packages to AzureArtifacts feed (always happens except on PR builds) - task: NuGetCommand@2 + condition: succeeded() + displayName: Push NuGet packages to AzureArtifacts + continueOnError: true inputs: command: push nuGetFeedType: external packagesToPush: '$(Build.ArtifactStagingDirectory)/*.nupkg' publishFeedCredentials: 'AzureArtifacts-nanoFirmwareFlasher' - condition: succeeded() - continueOnError: true - displayName: Push NuGet packages to AzureArtifacts # push NuGet class lib package to NuGet (happens on tag builds for any branch) - task: NuGetCommand@2 + condition: and( succeeded(), ne(variables['Build.Reason'], 'PullRequest') ) + displayName: Push NuGet packages to NuGet + continueOnError: true inputs: command: push nuGetFeedType: external allowPackageConflicts: true packagesToPush: '$(Build.ArtifactStagingDirectory)/*.nupkg' publishFeedCredentials: 'NuGet-nanoFirmwareFlasher' - condition: and( succeeded(), ne(variables['Build.Reason'], 'PullRequest') ) - continueOnError: true - displayName: Push NuGet packages to NuGet # create or update GitHub release ON tags from release or master branches - task: GitHubReleasePublish@1 + condition: and( succeeded(), ne(variables['Build.Reason'], 'PullRequest'), not( startsWith(variables['Build.SourceBranch'], 'refs/tags/v') ) ) + displayName: Create/Update GitHub PREVIEW release inputs: githubEndpoint: 'nanoFramework' githubOwner: 'nanoframework' @@ -281,11 +280,11 @@ jobs: githubEditRelease: true githubDeleteEmptyTag: true githubReleaseAsset: '$(Build.ArtifactStagingDirectory)/*.nupkg' - condition: and( succeeded(), ne(variables['Build.Reason'], 'PullRequest'), not( startsWith(variables['Build.SourceBranch'], 'refs/tags/v') ) ) - displayName: Create/Update GitHub PREVIEW release # create or update GitHub release ON tags from release or master branches - task: GitHubReleasePublish@1 + condition: and( succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v'), not(contains(variables['Build.SourceBranch'], 'preview') ) ) + displayName: Create/Update GitHub stable release inputs: githubEndpoint: 'nanoFramework' githubOwner: 'nanoframework' @@ -301,8 +300,6 @@ jobs: githubEditRelease: false githubDeleteEmptyTag: true githubReleaseAsset: '$(Build.ArtifactStagingDirectory)/$(nugetPackageName).$(MY_NUGET_VERSION).nupkg' - condition: and( succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v'), not(contains(variables['Build.SourceBranch'], 'preview') ) ) - displayName: Create/Update GitHub stable release ################################## # report build failure to Discord diff --git a/source/nanoFirmwareFlasher.sln b/nanoFirmwareFlasher.sln similarity index 100% rename from source/nanoFirmwareFlasher.sln rename to nanoFirmwareFlasher.sln diff --git a/source/nanoFirmwareFlasher/BintrayPackageInfo.cs b/nanoFirmwareFlasher/BintrayPackageInfo.cs similarity index 100% rename from source/nanoFirmwareFlasher/BintrayPackageInfo.cs rename to nanoFirmwareFlasher/BintrayPackageInfo.cs diff --git a/source/nanoFirmwareFlasher/CC13x26x2Device.cs b/nanoFirmwareFlasher/CC13x26x2Device.cs similarity index 100% rename from source/nanoFirmwareFlasher/CC13x26x2Device.cs rename to nanoFirmwareFlasher/CC13x26x2Device.cs diff --git a/source/nanoFirmwareFlasher/CC13x26x2Firmware.cs b/nanoFirmwareFlasher/CC13x26x2Firmware.cs similarity index 100% rename from source/nanoFirmwareFlasher/CC13x26x2Firmware.cs rename to nanoFirmwareFlasher/CC13x26x2Firmware.cs diff --git a/source/nanoFirmwareFlasher/CC13x26x2Operations.cs b/nanoFirmwareFlasher/CC13x26x2Operations.cs similarity index 100% rename from source/nanoFirmwareFlasher/CC13x26x2Operations.cs rename to nanoFirmwareFlasher/CC13x26x2Operations.cs diff --git a/source/nanoFirmwareFlasher/Esp32Firmware.cs b/nanoFirmwareFlasher/Esp32Firmware.cs similarity index 100% rename from source/nanoFirmwareFlasher/Esp32Firmware.cs rename to nanoFirmwareFlasher/Esp32Firmware.cs diff --git a/source/nanoFirmwareFlasher/Esp32Operations.cs b/nanoFirmwareFlasher/Esp32Operations.cs similarity index 100% rename from source/nanoFirmwareFlasher/Esp32Operations.cs rename to nanoFirmwareFlasher/Esp32Operations.cs diff --git a/source/nanoFirmwareFlasher/EspTool.cs b/nanoFirmwareFlasher/EspTool.cs similarity index 100% rename from source/nanoFirmwareFlasher/EspTool.cs rename to nanoFirmwareFlasher/EspTool.cs diff --git a/source/nanoFirmwareFlasher/Exceptions/BadDfuProtocolVersionException.cs b/nanoFirmwareFlasher/Exceptions/BadDfuProtocolVersionException.cs similarity index 100% rename from source/nanoFirmwareFlasher/Exceptions/BadDfuProtocolVersionException.cs rename to nanoFirmwareFlasher/Exceptions/BadDfuProtocolVersionException.cs diff --git a/source/nanoFirmwareFlasher/Exceptions/CantConnectToJtagDeviceException.cs b/nanoFirmwareFlasher/Exceptions/CantConnectToJtagDeviceException.cs similarity index 100% rename from source/nanoFirmwareFlasher/Exceptions/CantConnectToJtagDeviceException.cs rename to nanoFirmwareFlasher/Exceptions/CantConnectToJtagDeviceException.cs diff --git a/source/nanoFirmwareFlasher/Exceptions/CantOpenDfuDeviceException.cs b/nanoFirmwareFlasher/Exceptions/CantOpenDfuDeviceException.cs similarity index 100% rename from source/nanoFirmwareFlasher/Exceptions/CantOpenDfuDeviceException.cs rename to nanoFirmwareFlasher/Exceptions/CantOpenDfuDeviceException.cs diff --git a/source/nanoFirmwareFlasher/Exceptions/CantReadDfuDescriptorException.cs b/nanoFirmwareFlasher/Exceptions/CantReadDfuDescriptorException.cs similarity index 100% rename from source/nanoFirmwareFlasher/Exceptions/CantReadDfuDescriptorException.cs rename to nanoFirmwareFlasher/Exceptions/CantReadDfuDescriptorException.cs diff --git a/source/nanoFirmwareFlasher/Exceptions/CantReadUsbDescriptorException.cs b/nanoFirmwareFlasher/Exceptions/CantReadUsbDescriptorException.cs similarity index 100% rename from source/nanoFirmwareFlasher/Exceptions/CantReadUsbDescriptorException.cs rename to nanoFirmwareFlasher/Exceptions/CantReadUsbDescriptorException.cs diff --git a/source/nanoFirmwareFlasher/Exceptions/DfuFileDoesNotExistException.cs b/nanoFirmwareFlasher/Exceptions/DfuFileDoesNotExistException.cs similarity index 100% rename from source/nanoFirmwareFlasher/Exceptions/DfuFileDoesNotExistException.cs rename to nanoFirmwareFlasher/Exceptions/DfuFileDoesNotExistException.cs diff --git a/source/nanoFirmwareFlasher/Exceptions/DfuVerificationFailedException.cs b/nanoFirmwareFlasher/Exceptions/DfuVerificationFailedException.cs similarity index 100% rename from source/nanoFirmwareFlasher/Exceptions/DfuVerificationFailedException.cs rename to nanoFirmwareFlasher/Exceptions/DfuVerificationFailedException.cs diff --git a/source/nanoFirmwareFlasher/Exceptions/EraseEsp32FlashException.cs b/nanoFirmwareFlasher/Exceptions/EraseEsp32FlashException.cs similarity index 100% rename from source/nanoFirmwareFlasher/Exceptions/EraseEsp32FlashException.cs rename to nanoFirmwareFlasher/Exceptions/EraseEsp32FlashException.cs diff --git a/source/nanoFirmwareFlasher/Exceptions/EspToolExecutionException.cs b/nanoFirmwareFlasher/Exceptions/EspToolExecutionException.cs similarity index 100% rename from source/nanoFirmwareFlasher/Exceptions/EspToolExecutionException.cs rename to nanoFirmwareFlasher/Exceptions/EspToolExecutionException.cs diff --git a/source/nanoFirmwareFlasher/Exceptions/ReadEsp32FlashException.cs b/nanoFirmwareFlasher/Exceptions/ReadEsp32FlashException.cs similarity index 100% rename from source/nanoFirmwareFlasher/Exceptions/ReadEsp32FlashException.cs rename to nanoFirmwareFlasher/Exceptions/ReadEsp32FlashException.cs diff --git a/source/nanoFirmwareFlasher/Exceptions/StLinkCliExecutionException.cs b/nanoFirmwareFlasher/Exceptions/StLinkCliExecutionException.cs similarity index 100% rename from source/nanoFirmwareFlasher/Exceptions/StLinkCliExecutionException.cs rename to nanoFirmwareFlasher/Exceptions/StLinkCliExecutionException.cs diff --git a/source/nanoFirmwareFlasher/Exceptions/UniflashCliExecutionException.cs b/nanoFirmwareFlasher/Exceptions/UniflashCliExecutionException.cs similarity index 100% rename from source/nanoFirmwareFlasher/Exceptions/UniflashCliExecutionException.cs rename to nanoFirmwareFlasher/Exceptions/UniflashCliExecutionException.cs diff --git a/source/nanoFirmwareFlasher/Exceptions/WriteEsp32FlashException.cs b/nanoFirmwareFlasher/Exceptions/WriteEsp32FlashException.cs similarity index 100% rename from source/nanoFirmwareFlasher/Exceptions/WriteEsp32FlashException.cs rename to nanoFirmwareFlasher/Exceptions/WriteEsp32FlashException.cs diff --git a/source/nanoFirmwareFlasher/ExitCodes.cs b/nanoFirmwareFlasher/ExitCodes.cs similarity index 100% rename from source/nanoFirmwareFlasher/ExitCodes.cs rename to nanoFirmwareFlasher/ExitCodes.cs diff --git a/source/nanoFirmwareFlasher/Extensions/AttributeExtensions.cs b/nanoFirmwareFlasher/Extensions/AttributeExtensions.cs similarity index 100% rename from source/nanoFirmwareFlasher/Extensions/AttributeExtensions.cs rename to nanoFirmwareFlasher/Extensions/AttributeExtensions.cs diff --git a/source/nanoFirmwareFlasher/Extensions/CommandLineExtensions.cs b/nanoFirmwareFlasher/Extensions/CommandLineExtensions.cs similarity index 100% rename from source/nanoFirmwareFlasher/Extensions/CommandLineExtensions.cs rename to nanoFirmwareFlasher/Extensions/CommandLineExtensions.cs diff --git a/source/nanoFirmwareFlasher/FirmwarePackage.cs b/nanoFirmwareFlasher/FirmwarePackage.cs similarity index 100% rename from source/nanoFirmwareFlasher/FirmwarePackage.cs rename to nanoFirmwareFlasher/FirmwarePackage.cs diff --git a/source/nanoFirmwareFlasher/Options.cs b/nanoFirmwareFlasher/Options.cs similarity index 100% rename from source/nanoFirmwareFlasher/Options.cs rename to nanoFirmwareFlasher/Options.cs diff --git a/source/nanoFirmwareFlasher/Program.cs b/nanoFirmwareFlasher/Program.cs similarity index 100% rename from source/nanoFirmwareFlasher/Program.cs rename to nanoFirmwareFlasher/Program.cs diff --git a/source/nanoFirmwareFlasher/StDfu.cs b/nanoFirmwareFlasher/StDfu.cs similarity index 100% rename from source/nanoFirmwareFlasher/StDfu.cs rename to nanoFirmwareFlasher/StDfu.cs diff --git a/source/nanoFirmwareFlasher/Stm32Firmware.cs b/nanoFirmwareFlasher/Stm32Firmware.cs similarity index 100% rename from source/nanoFirmwareFlasher/Stm32Firmware.cs rename to nanoFirmwareFlasher/Stm32Firmware.cs diff --git a/source/nanoFirmwareFlasher/Stm32Operations.cs b/nanoFirmwareFlasher/Stm32Operations.cs similarity index 100% rename from source/nanoFirmwareFlasher/Stm32Operations.cs rename to nanoFirmwareFlasher/Stm32Operations.cs diff --git a/source/nanoFirmwareFlasher/StmDfuDevice.cs b/nanoFirmwareFlasher/StmDfuDevice.cs similarity index 100% rename from source/nanoFirmwareFlasher/StmDfuDevice.cs rename to nanoFirmwareFlasher/StmDfuDevice.cs diff --git a/source/nanoFirmwareFlasher/StmJtagDevice.cs b/nanoFirmwareFlasher/StmJtagDevice.cs similarity index 100% rename from source/nanoFirmwareFlasher/StmJtagDevice.cs rename to nanoFirmwareFlasher/StmJtagDevice.cs diff --git a/source/nanoFirmwareFlasher/UPDATE ESPTOOL.txt b/nanoFirmwareFlasher/UPDATE ESPTOOL.txt similarity index 100% rename from source/nanoFirmwareFlasher/UPDATE ESPTOOL.txt rename to nanoFirmwareFlasher/UPDATE ESPTOOL.txt diff --git a/source/nanoFirmwareFlasher/nanoFirmwareFlasher.csproj b/nanoFirmwareFlasher/nanoFirmwareFlasher.csproj similarity index 85% rename from source/nanoFirmwareFlasher/nanoFirmwareFlasher.csproj rename to nanoFirmwareFlasher/nanoFirmwareFlasher.csproj index a106a750..47a882ef 100644 --- a/source/nanoFirmwareFlasher/nanoFirmwareFlasher.csproj +++ b/nanoFirmwareFlasher/nanoFirmwareFlasher.csproj @@ -53,28 +53,28 @@ - + true content\stdfu;contentFiles\stdfu - + true content\esptool;contentFiles\esptool - + true content\stlink;contentFiles\stlink - + true content\uniflash;contentFiles\uniflash diff --git a/source/nanoFirmwareFlasher/update_esptool.ps1 b/nanoFirmwareFlasher/update_esptool.ps1 similarity index 100% rename from source/nanoFirmwareFlasher/update_esptool.ps1 rename to nanoFirmwareFlasher/update_esptool.ps1 diff --git a/source/version.json b/version.json similarity index 100% rename from source/version.json rename to version.json