Skip to content

Commit

Permalink
Remove .NET Core install templates from pipelines (Azure#5990)
Browse files Browse the repository at this point in the history
Cherry-pick 497108e from release/1.2.
  • Loading branch information
damonbarry authored and lt72 committed Jan 31, 2022
1 parent 1bd3588 commit 5e5ba74
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 21 deletions.
1 change: 0 additions & 1 deletion builds/checkin/dotnet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ jobs:
pool:
vmImage: "ubuntu-18.04"
steps:
- template: ../templates/install-dotnet3.yaml
- task: Bash@3
displayName: Install Prerequisites
inputs:
Expand Down
1 change: 0 additions & 1 deletion builds/ci/dotnet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ jobs:
IotDevice3ConnStr2,
IotHubConnStr2,
IotHubMqttHeadCert
- template: ../templates/install-dotnet3.yaml
- task: Bash@3
displayName: Install Prerequisites
inputs:
Expand Down
4 changes: 0 additions & 4 deletions builds/misc/images-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,11 @@ stages:
dependsOn: []
jobs:
- job: BuildDotnetComponents
# This job is run on a hosted linux agent, which needs dotnet 2 and 3 installed as a manual step.
# 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:
# Dotnet 2 needed for codesign
- template: ../templates/install-dotnet2.yaml
- template: ../templates/install-dotnet3.yaml
- template: ../templates/dotnet3-globaljson.yaml # use dotnet 3 as primary install for build
# Build
- task: ShellScript@2
Expand Down
2 changes: 1 addition & 1 deletion builds/templates/dotnet2-globaljson.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ steps:
displayName: 'Use dotnet 2'
inputs:
targetType: 'inline'
script: 'dotnet new globaljson --force --sdk-version 2.2.207'
script: 'dotnet new globaljson --force --sdk-version 2.1'
2 changes: 1 addition & 1 deletion builds/templates/dotnet3-globaljson.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ steps:
displayName: 'Use dotnet 3'
inputs:
targetType: 'inline'
script: 'dotnet new globaljson --force --sdk-version 3.1.202'
script: 'dotnet new globaljson --force --sdk-version 3.1'
6 changes: 0 additions & 6 deletions builds/templates/install-dotnet2.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions builds/templates/install-dotnet3.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,20 @@
<Title>Microsoft Azure Edge Function extension</Title>
<Authors>Microsoft</Authors>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageLicenseUrl>https://github.com/Azure/iotedge/blob/master/LICENSE</PackageLicenseUrl>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<Description>This package contains binding extensions for IoTEdge.</Description>
<PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288890</PackageIconUrl>
<PackageIcon>icon.png</PackageIcon>
<PackageProjectUrl>https://github.com/Azure/iotedge</PackageProjectUrl>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<PackageTags>IoT Microsoft Azure IoTEdge Functions</PackageTags>
</PropertyGroup>

<ItemGroup>
<None Include="..\..\..\..\..\LICENSE" Pack="true" PackagePath=""/>
<None Include="images\icon.png" Pack="true" PackagePath=""/>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Devices.Client" Version="1.36.3" />
<PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.27" />
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 5e5ba74

Please sign in to comment.