Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to Dotnet 6 #6214

Merged
merged 25 commits into from
Apr 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
47ac550
squash dev commits
and-rewsmith Mar 29, 2022
8b4d76b
self review
and-rewsmith Mar 29, 2022
84c9bdb
merge conflict upstream main
and-rewsmith Mar 30, 2022
d2d7da1
debug to see if explicit open async helps
and-rewsmith Mar 30, 2022
7658d50
Revert "debug to see if explicit open async helps"
and-rewsmith Mar 31, 2022
bcde20a
update to ubuntu 20 rust builds
and-rewsmith Apr 1, 2022
fb6995a
don't have script take forever
and-rewsmith Apr 1, 2022
8b92a5e
update alpine build image to ubuntu 20
and-rewsmith Apr 4, 2022
a4c5a04
use rust 1.59.0 for watchdog
and-rewsmith Apr 4, 2022
d72e41a
don't wait when building
and-rewsmith Apr 4, 2022
ab0f22b
get information needed for rustc bug
and-rewsmith Apr 4, 2022
7421cff
shell out to sleep
and-rewsmith Apr 5, 2022
d5b879e
Revert "use rust 1.59.0 for watchdog"
and-rewsmith Apr 5, 2022
fb3106b
Revert "get information needed for rustc bug"
and-rewsmith Apr 5, 2022
0b3e3a0
use ubuntu18 builder image for alpine 6.0
and-rewsmith Apr 5, 2022
197beda
log when done with setup
and-rewsmith Apr 6, 2022
1e8cefc
document issue
and-rewsmith Apr 7, 2022
25d86dc
squash dev commits
and-rewsmith Apr 8, 2022
2deeffa
bump alpine build os to ubuntu20
and-rewsmith Apr 8, 2022
0bf0fda
Merge branch 'andsmi/net6' of github.com:and-rewsmith/iotedge into an…
and-rewsmith Apr 11, 2022
d990664
consistency for Edge Agent spacing
and-rewsmith Apr 11, 2022
8ca5e3b
Merge branch 'main' into andsmi/net6
and-rewsmith Apr 12, 2022
e5d9fc8
Merge branch 'main' into andsmi/net6
and-rewsmith Apr 12, 2022
f9891a1
manually specified bin directories migrate to net6.0
and-rewsmith Apr 12, 2022
feba199
merge conflict upstream main
and-rewsmith Apr 13, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions Microsoft.Azure.Devices.Edge.sln
Original file line number Diff line number Diff line change
Expand Up @@ -193,14 +193,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Devices.Edg
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Devices.Routing.Core.Test", "edge-hub\core\test\Microsoft.Azure.Devices.Routing.Core.Test\Microsoft.Azure.Devices.Routing.Core.Test.csproj", "{5D0F6FB0-8716-4247-A5BE-92DA5B9E2189}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "edge-modules", "edge-modules", "{43E10CBA-2F64-4B4C-A5A5-B9E332DC98A1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "functions", "functions", "{059BC610-4D1E-4A4D-9099-E67DF47D7DB7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{4F3B7488-3547-4EEB-A79E-9737182960AB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EdgeHubTriggerCSharp", "edge-modules\functions\samples\EdgeHubTrigger-Csharp\EdgeHubTriggerCSharp.csproj", "{9F5BD0E2-E73D-434A-8568-0C117A0716C9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NumberLogger", "test\modules\NumberLogger\NumberLogger.csproj", "{B0151FFD-85C4-42B9-81CC-9193BADFE9F8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jsoncanonicalizer", "edge-util\src\jsoncanonicalizer\jsoncanonicalizer.csproj", "{1915CE7E-E949-4633-9862-D92BD5E873B5}"
Expand All @@ -211,6 +203,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ManifestSignerClient", "sam
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IotedgeDiagnosticsDotnet", "edge-modules\iotedge-diagnostics-dotnet\IotedgeDiagnosticsDotnet.csproj", "{59CF2F3B-5FCC-43BE-B221-1E7A956D4792}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "edge-modules", "edge-modules", "{17D4D30E-7C88-479D-AF04-735DCCBA3AD4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "functions", "functions", "{72DC75C8-2116-4836-BB95-2D2B5BF34452}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{10886974-CE80-40FC-9647-A9C145DE420C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EdgeHubTriggerCSharp", "edge-modules\functions\samples\EdgeHubTrigger-Csharp\EdgeHubTriggerCSharp.csproj", "{8E7FB9D5-4736-4CE0-8698-2F30E2E49B59}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
CheckInBuild|Any CPU = CheckInBuild|Any CPU
Expand Down Expand Up @@ -602,12 +602,6 @@ Global
{5D0F6FB0-8716-4247-A5BE-92DA5B9E2189}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5D0F6FB0-8716-4247-A5BE-92DA5B9E2189}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5D0F6FB0-8716-4247-A5BE-92DA5B9E2189}.Release|Any CPU.Build.0 = Release|Any CPU
{9F5BD0E2-E73D-434A-8568-0C117A0716C9}.CheckInBuild|Any CPU.ActiveCfg = CheckInBuild|Any CPU
{9F5BD0E2-E73D-434A-8568-0C117A0716C9}.CheckInBuild|Any CPU.Build.0 = CheckInBuild|Any CPU
{9F5BD0E2-E73D-434A-8568-0C117A0716C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9F5BD0E2-E73D-434A-8568-0C117A0716C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9F5BD0E2-E73D-434A-8568-0C117A0716C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9F5BD0E2-E73D-434A-8568-0C117A0716C9}.Release|Any CPU.Build.0 = Release|Any CPU
{B0151FFD-85C4-42B9-81CC-9193BADFE9F8}.CheckInBuild|Any CPU.ActiveCfg = CheckInBuild|Any CPU
{B0151FFD-85C4-42B9-81CC-9193BADFE9F8}.CheckInBuild|Any CPU.Build.0 = CheckInBuild|Any CPU
{B0151FFD-85C4-42B9-81CC-9193BADFE9F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -638,6 +632,12 @@ Global
{59CF2F3B-5FCC-43BE-B221-1E7A956D4792}.Debug|Any CPU.Build.0 = Debug|Any CPU
{59CF2F3B-5FCC-43BE-B221-1E7A956D4792}.Release|Any CPU.ActiveCfg = Release|Any CPU
{59CF2F3B-5FCC-43BE-B221-1E7A956D4792}.Release|Any CPU.Build.0 = Release|Any CPU
{8E7FB9D5-4736-4CE0-8698-2F30E2E49B59}.CheckInBuild|Any CPU.ActiveCfg = CheckInBuild|Any CPU
{8E7FB9D5-4736-4CE0-8698-2F30E2E49B59}.CheckInBuild|Any CPU.Build.0 = CheckInBuild|Any CPU
{8E7FB9D5-4736-4CE0-8698-2F30E2E49B59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8E7FB9D5-4736-4CE0-8698-2F30E2E49B59}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8E7FB9D5-4736-4CE0-8698-2F30E2E49B59}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8E7FB9D5-4736-4CE0-8698-2F30E2E49B59}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -720,14 +720,14 @@ Global
{111DFD7C-FC04-4A68-8CC1-D986CCC3DAC3} = {F5A09810-99FB-43EB-A86E-A15E48EED108}
{240DF1F3-6472-472A-9748-494D79AEF085} = {F5A09810-99FB-43EB-A86E-A15E48EED108}
{5D0F6FB0-8716-4247-A5BE-92DA5B9E2189} = {F5A09810-99FB-43EB-A86E-A15E48EED108}
{059BC610-4D1E-4A4D-9099-E67DF47D7DB7} = {43E10CBA-2F64-4B4C-A5A5-B9E332DC98A1}
{4F3B7488-3547-4EEB-A79E-9737182960AB} = {059BC610-4D1E-4A4D-9099-E67DF47D7DB7}
{9F5BD0E2-E73D-434A-8568-0C117A0716C9} = {4F3B7488-3547-4EEB-A79E-9737182960AB}
{B0151FFD-85C4-42B9-81CC-9193BADFE9F8} = {F921339B-32F9-4BF3-B364-2DB01FA2F1A1}
{1915CE7E-E949-4633-9862-D92BD5E873B5} = {66964A75-04AC-4FDE-8505-E6CB2EF90BE8}
{BE39EC1F-7E7C-4421-93BF-1DF02C1E6A15} = {66964A75-04AC-4FDE-8505-E6CB2EF90BE8}
{C4C3CEB4-1177-4D1C-9BAE-EE0453831905} = {A6D8677F-DB76-459E-B6DE-110AFCEF7F08}
{59CF2F3B-5FCC-43BE-B221-1E7A956D4792} = {578D5330-2F72-44C6-9DB5-C93B3F42C473}
{72DC75C8-2116-4836-BB95-2D2B5BF34452} = {17D4D30E-7C88-479D-AF04-735DCCBA3AD4}
{10886974-CE80-40FC-9647-A9C145DE420C} = {72DC75C8-2116-4836-BB95-2D2B5BF34452}
{8E7FB9D5-4736-4CE0-8698-2F30E2E49B59} = {10886974-CE80-40FC-9647-A9C145DE420C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D71830F5-3AF5-46B4-8A9E-1DCE4F2253AC}
Expand Down
6 changes: 3 additions & 3 deletions builds/checkin/dotnet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
################################################################################
displayName: Check pipeline preconditions (changes ARE NOT in either edgelet, docs, or mqtt folder)
pool:
vmImage: "ubuntu-18.04"
vmImage: "ubuntu-20.04"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does dotnet6 only run on ubuntu 20.04 or this was just an unrelated enhancement?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated enhancement.

steps:
- bash: |
git log -m -1 --name-only --first-parent --pretty="" | egrep -i -v '^(edgelet|doc|mqtt)'
Expand All @@ -29,7 +29,7 @@ jobs:
dependsOn: check_run_pipeline
condition: eq(dependencies.check_run_pipeline.outputs['check_files.RUN_PIPELINE'], 'true')
pool:
vmImage: "ubuntu-18.04"
vmImage: "ubuntu-20.04"
steps:
- task: Bash@3
displayName: Install Prerequisites
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
variables:
coverage.goal: 60
pool:
vmImage: windows-2019
vmImage: windows-2022
steps:
- task: DotNetCoreCLI@2
displayName: Build
Expand Down
4 changes: 2 additions & 2 deletions builds/e2e/compare-compatibility.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
script: |
az login --service-principal -p $(edgebuild-service-principal-secret) -u $(servicePrincipal.clientId) --tenant $(servicePrincipal.tenantId)
- bash: |
contextPath=$(Build.SourcesDirectory)/test/Microsoft.Azure.Devices.Edge.Test/bin/Debug/netcoreapp3.1/context.json
contextPath=$(Build.SourcesDirectory)/test/Microsoft.Azure.Devices.Edge.Test/bin/Debug/net6.0/context.json
mkdir -p $(Build.ArtifactStagingDirectory)/compat
edgeAgentImage="$(cat $contextPath | jq '.edgeAgentImage' | tr -d '"')"
edgeHubImage="$(cat $contextPath | jq '.edgeHubImage' | tr -d '"')"
Expand Down Expand Up @@ -171,7 +171,7 @@ jobs:
export PATH=azure-cli-env/bin/:$PATH
az login --service-principal -p $(edgebuild-service-principal-secret) -u $(servicePrincipal.clientId) --tenant $(servicePrincipal.tenantId)

contextPath=$(Build.SourcesDirectory)/test/Microsoft.Azure.Devices.Edge.Test/bin/Debug/netcoreapp3.1/context.json
contextPath=$(Build.SourcesDirectory)/test/Microsoft.Azure.Devices.Edge.Test/bin/Debug/net6.0/context.json
mkdir -p $(Build.ArtifactStagingDirectory)/compat
edgeAgentImage="$(cat $contextPath | jq '.edgeAgentImage' | tr -d '"')"
edgeHubImage="$(cat $contextPath | jq '.edgeHubImage' | tr -d '"')"
Expand Down
4 changes: 2 additions & 2 deletions builds/e2e/proxy/configure_runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ proxy="http://${1}:3128"
export http_proxy=$proxy
export https_proxy=$proxy

echo 'Installing PowerShell Core and .NET Core 3.1'
echo 'Installing PowerShell Core and .NET 6.0'

apt-get update
apt-get install -y curl git wget apt-transport-https
wget -q 'https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb'
dpkg -i packages-microsoft-prod.deb
apt-get update
add-apt-repository universe
apt-get install -y powershell dotnet-sdk-3.1
apt-get install -y powershell dotnet-sdk-6.0

echo 'Installing Moby engine'

Expand Down
4 changes: 2 additions & 2 deletions builds/e2e/templates/e2e-setup-base-image-update-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ steps:
$testDir = '$(Build.SourcesDirectory)/test/Microsoft.Azure.Devices.Edge.Test'
dotnet build -c $(Build.Configuration) $testDir
$binDir = Convert-Path "$testDir/bin/$(Build.Configuration)/netcoreapp3.1"
$binDir = Convert-Path "$testDir/bin/$(Build.Configuration)/net6.0"
Write-Output "##vso[task.setvariable variable=binDir]$binDir"
env:
http_proxy: $(Agent.ProxyUrl)
Expand All @@ -63,7 +63,7 @@ steps:
- pwsh: |
$manifestSignerClientDir = '$(Build.SourcesDirectory)/samples/dotnet/ManifestSignerClient'
dotnet build -c $(Build.Configuration) $manifestSignerClientDir
$manifestSignerClientBinDir = Convert-Path "$manifestSignerClientDir/bin/$(Build.Configuration)/netcoreapp3.1"
$manifestSignerClientBinDir = Convert-Path "$manifestSignerClientDir/bin/$(Build.Configuration)/net6.0"
Write-Output "##vso[task.setvariable variable=manifestSignerClientDir]$manifestSignerClientDir"
Write-Output "##vso[task.setvariable variable=manifestSignerClientBinDir]$manifestSignerClientBinDir"
$manifestSigningTestDir = '$(System.ArtifactsDirectory)/manifest_signing'
Expand Down
4 changes: 2 additions & 2 deletions builds/e2e/templates/e2e-setup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ steps:
$testDir = '$(Build.SourcesDirectory)/test/Microsoft.Azure.Devices.Edge.Test'
dotnet build $testDir

$binDir = Convert-Path "$testDir/bin/Debug/netcoreapp3.1"
$binDir = Convert-Path "$testDir/bin/Debug/net6.0"
Write-Output "##vso[task.setvariable variable=binDir]$binDir"
env:
http_proxy: $(Agent.ProxyUrl)
Expand All @@ -139,7 +139,7 @@ steps:
- pwsh: |
$manifestSignerClientDir = '$(Build.SourcesDirectory)/samples/dotnet/ManifestSignerClient'
dotnet build $manifestSignerClientDir
$manifestSignerClientBinDir = Convert-Path "$manifestSignerClientDir/bin/Debug/netcoreapp3.1"
$manifestSignerClientBinDir = Convert-Path "$manifestSignerClientDir/bin/Debug/net6.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You will need to update e2e-setup-base-image-update-release.yaml as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep I think so, good catch. Also compare-compatability.yaml

Write-Output "##vso[task.setvariable variable=manifestSignerClientDir]$manifestSignerClientDir"
Write-Output "##vso[task.setvariable variable=manifestSignerClientBinDir]$manifestSignerClientBinDir"
$manifestSigningTestDir = '$(System.ArtifactsDirectory)/manifest_signing'
Expand Down
2 changes: 1 addition & 1 deletion builds/misc/images-mqtt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
displayName: Build MQTT Broker - arm32
inputs:
filePath: scripts/linux/cross-platform-rust-build.sh
arguments: --os ubuntu18.04 --arch arm32v7 --build-path mqtt/mqttd --cargo-flags '--no-default-features --features="generic"'
arguments: --os ubuntu20.04 --arch arm32v7 --build-path mqtt/mqttd --cargo-flags '--no-default-features --features="generic"'

- script: scripts/linux/consolidate-build-artifacts.sh --artifact-name 'mqttd'
displayName: Consolidate MQTT Broker artifacts
Expand Down
34 changes: 16 additions & 18 deletions builds/misc/images-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,28 @@ stages:
dependsOn: []
jobs:
- job: BuildDotnetComponents
# The code sign steps will fail unless we explicitly say to use dotnet 2 before.
# This means we have to toggle back and forth between primary dotnet installations for the sign and build.
# TODO: Investigate why we have to toggle primary installs on linux, when we didn't have to do this on windows (now removed).
displayName: Build Dotnet Components
steps:
- template: ../templates/dotnet3-globaljson.yaml # use dotnet 3 as primary install for build
# Build
- task: ShellScript@2
displayName: "Build (Release) dotnet artifacts"
displayName: "Build .NET artifacts"
inputs:
args: "-c Release"
scriptPath: scripts/linux/buildBranch.sh
- task: DotNetCoreCLI@2
displayName: "Build Functions Binding nuget package"
inputs:
buildProperties: OutDir=$(Build.BinariesDirectory)/publish/Microsoft.Azure.WebJobs.Extensions.EdgeHub
command: pack
nobuild: true
packDirectory: $(Build.BinariesDirectory)/publish/
packagesToPack: "**/Microsoft.Azure.WebJobs.Extensions.EdgeHub.csproj"
versionEnvVar: version
versioningScheme: byEnvVar
# The code sign task requires .NET Core 2.1.
# TODO: Investigate why we have to toggle primary installs on linux, when we didn't have to do this on windows (now removed).
- template: ../templates/force-dotnet21.yaml
# Code Sign
- template: ../templates/dotnet2-globaljson.yaml # switch to dotnet 2 as primary install for code sign
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
displayName: "Edge Agent Code Sign"
inputs:
Expand Down Expand Up @@ -246,18 +254,6 @@ stages:
}
]
signConfigType: inlineSignParams
- template: ../templates/dotnet3-globaljson.yaml # switch to dotnet 3 as primary install for nuget package
- task: DotNetCoreCLI@2
displayName: "Functions Binding nuget package"
inputs:
buildProperties: OutDir=$(Build.BinariesDirectory)/publish/Microsoft.Azure.WebJobs.Extensions.EdgeHub
command: pack
nobuild: true
packDirectory: $(Build.BinariesDirectory)/publish/
packagesToPack: "**/Microsoft.Azure.WebJobs.Extensions.EdgeHub.csproj"
versionEnvVar: version
versioningScheme: byEnvVar
- template: ../templates/dotnet2-globaljson.yaml # switch to dotnet 2 as primary install for code sign
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
displayName: "Functions Binding nuget package Sign"
inputs:
Expand All @@ -282,6 +278,8 @@ stages:
}
]
signConfigType: inlineSignParams
# We're done with code signing, so remove dotnet version override
- template: ../templates/restore-default-dotnet.yaml
- bash: |
mkdir $(Build.ArtifactStagingDirectory)/publish-linux && \
mv $(Build.BinariesDirectory)/publish/{CACertificates,e2e_deployment_files,e2e_test_files,\
Expand Down
8 changes: 4 additions & 4 deletions builds/misc/templates/build-broker-watchdog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
displayName: Build MQTT Broker - arm32
inputs:
filePath: scripts/linux/cross-platform-rust-build.sh
arguments: --os ubuntu18.04 --arch arm32v7 --build-path mqtt/mqttd
arguments: --os ubuntu20.04 --arch arm32v7 --build-path mqtt/mqttd
- task: CopyFiles@2
inputs:
sourceFolder: 'mqtt/target/armv7-unknown-linux-gnueabihf/release/'
Expand All @@ -39,7 +39,7 @@ jobs:
displayName: Build MQTT Broker - arm64
inputs:
filePath: scripts/linux/cross-platform-rust-build.sh
arguments: --os ubuntu18.04 --arch aarch64 --build-path mqtt/mqttd
arguments: --os ubuntu20.04 --arch aarch64 --build-path mqtt/mqttd
- task: CopyFiles@2
inputs:
sourceFolder: 'mqtt/target/aarch64-unknown-linux-gnu/release/'
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
displayName: Build watchdog - arm32
inputs:
filePath: scripts/linux/cross-platform-rust-build.sh
arguments: --os ubuntu18.04 --arch arm32v7 --build-path edge-hub/watchdog
arguments: --os ubuntu20.04 --arch arm32v7 --build-path edge-hub/watchdog
- task: CopyFiles@2
inputs:
sourceFolder: 'edge-hub/watchdog/target/armv7-unknown-linux-gnueabihf/release/'
Expand All @@ -90,7 +90,7 @@ jobs:
displayName: Build watchdog - arm64
inputs:
filePath: scripts/linux/cross-platform-rust-build.sh
arguments: --os ubuntu18.04 --arch aarch64 --build-path edge-hub/watchdog
arguments: --os ubuntu20.04 --arch aarch64 --build-path edge-hub/watchdog
- task: CopyFiles@2
inputs:
sourceFolder: 'edge-hub/watchdog/target/aarch64-unknown-linux-gnu/release/'
Expand Down
8 changes: 4 additions & 4 deletions builds/misc/templates/build-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ stages:
pool:
name: $(pool.linux.name)
demands:
- ImageOverride -equals agent-aziotedge-ubuntu-20.04-docker
- ImageOverride -equals agent-aziotedge-ubuntu-20.04-docker
dependsOn: CheckBuildImages
jobs:
- job: BuildDotnetComponents
Expand Down Expand Up @@ -137,7 +137,7 @@ stages:
pool:
name: $(pool.linux.name)
demands:
- ImageOverride -equals agent-aziotedge-ubuntu-20.04-docker
- ImageOverride -equals agent-aziotedge-ubuntu-20.04-docker
dependsOn: [BuildExecutables, BuildRocksDB]
jobs:
- job: ConsolidateAndPublishArtifacts
Expand Down Expand Up @@ -323,11 +323,11 @@ stages:
- job: BuildImageFunctionsSample
steps:
- template: image-linux.yaml
parameters:
parameters:
name: Functions Sample
imageName: azureiotedge-functions-filter
project: EdgeHubTriggerCSharp
bin_dir: '$(Build.BinariesDirectory)'
bin_dir: '$(Build.BinariesDirectory)'

- job: BuildImageDirectMethodSender
steps:
Expand Down
2 changes: 1 addition & 1 deletion builds/misc/templates/rust-test-module-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ steps:
displayName: Build ${{ parameters['module.name'] }} - ${{ parameters['arch'] }}
inputs:
filePath: scripts/linux/cross-platform-rust-build.sh
arguments: --os ubuntu18.04 --arch ${{ parameters['arch'] }} --build-path ${{ parameters['module.path'] }}
arguments: --os ubuntu20.04 --arch ${{ parameters['arch'] }} --build-path ${{ parameters['module.path'] }}
- task: PublishBuildArtifacts@1
inputs:
pathToPublish: ${{ parameters['module.path'] }}/target/${{ parameters['target'] }}/release/${{ parameters['module.name'] }}
Expand Down
2 changes: 1 addition & 1 deletion builds/service/service-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ steps:
$testDir = '$(Build.SourcesDirectory)/test/Microsoft.Azure.Devices.Edge.Test'
dotnet build $testDir
$binDir = Convert-Path "$testDir/bin/Debug/netcoreapp3.1"
$binDir = Convert-Path "$testDir/bin/Debug/net6.0"
Write-Output "##vso[task.setvariable variable=binDir]$binDir"
displayName: Build tests

Expand Down
7 changes: 0 additions & 7 deletions builds/templates/dotnet2-globaljson.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions builds/templates/dotnet3-globaljson.yaml

This file was deleted.

7 changes: 7 additions & 0 deletions builds/templates/force-dotnet21.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Add a global.json file to the root of the source code directory. This will override .NET's
# default behavior when determining which version of the runtime to use. Instead, .NET will
# use the version we specify here.
steps:
- bash: |
dotnet new globaljson --force --sdk-version 2.1
displayName: Use .NET Core 2.1
7 changes: 7 additions & 0 deletions builds/templates/restore-default-dotnet.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Remove the global.json file from the root of the source code directory, if it exists. This will
# remove any overrides, allowing .NET to use its default behavior (use latest) when determining
# which version of the runtime to use.
steps:
- bash: |
rm -f -v global.json
displayName: Restore default .NET version
Loading