Skip to content

Update dot net core #11741

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.

Sign up for GitHub

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

Closed
chidozieononiwu wants to merge 8 commits into from
Closed

Update dot net core #11741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
854de49
Update Dotnet Core SDk and Runtime
chidozieononiwu May 1, 2020
c7b3c00
Update globals.yml files
chidozieononiwu May 1, 2020
d621ad4
Update archetyp-client ymls
chidozieononiwu May 1, 2020
a64f489
Add netcoreapp3.1 to Directory.Build.Data.props
chidozieononiwu May 1, 2020
81d40f3
Add DotNetCoreRuntimeVersion variable to the Matrix
chidozieononiwu May 4, 2020
0bb2e91
Update netcore 2.1 version patch
chidozieononiwu May 4, 2020
6f3f4c3
Fix NU1605 error
chidozieononiwu May 8, 2020
a4a5f76
Update archetype-sdk-tests.yml
chidozieononiwu May 8, 2020
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
4 changes: 2 additions & 2 deletions eng/Directory.Build.Data.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@

<PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true' or '$(IsSamplesProject)' == 'true'">
<IsPackable>false</IsPackable>
<RequiredTargetFrameworks>netcoreapp2.1</RequiredTargetFrameworks>
<RequiredTargetFrameworks Condition="'$(OS)' == 'Windows_NT'">netcoreapp2.1;net461</RequiredTargetFrameworks>
<RequiredTargetFrameworks>netcoreapp2.1;netcoreapp3.1</RequiredTargetFrameworks>
Copy link
Member

@weshaggard weshaggard May 8, 2020

Choose a reason for hiding this comment

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

The build must be failing because of either this change or the DotNetCoreSDKVersion change. I'd suggest trying to isolate each to see what is causing the build failures.

<RequiredTargetFrameworks Condition="'$(OS)' == 'Windows_NT'">netcoreapp2.1;netcoreapp3.1;net461</RequiredTargetFrameworks>
</PropertyGroup>

<Import Project="TestFramework.props" Condition="'$(IsTestProject)' == 'true'"/>
Expand Down
1 change: 1 addition & 0 deletions eng/Packages.Data.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@
<PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20200416.2" />
<PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" />
<PackageReference Update="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19552.1" />
<PackageReference Update="Microsoft.NETCore.Targets" Version="3.0.0" />

<!-- Azure SDK packages -->
<PackageReference Update="Azure.Storage.Blobs" Version="12.0.0" />
Expand Down
42 changes: 34 additions & 8 deletions eng/pipelines/templates/jobs/archetype-sdk-client.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ jobs:
inputs:
version: "$(DotNetCoreSDKVersion)"
- task: UseDotNet@2
displayName: "Use .NET Core runtime $(DotNetCoreRuntimeVersion)"
displayName: "Use .NET Core runtime $(DotNetCoreRuntimeVersion2.1)"
inputs:
packageType: runtime
version: "$(DotNetCoreRuntimeVersion)"
version: "$(DotNetCoreRuntimeVersion2.1)"
- task: DownloadPipelineArtifact@2
displayName: "Download Build Artifacts"
condition: succeededOrFailed()
Expand Down Expand Up @@ -110,39 +110,65 @@ jobs:
strategy:
maxParallel: $[ variables['MaxParallelTestJobs'] ]
matrix:
Linux:
Linux_NetCoreApp2.1:
OSName: "Linux"
OSVmImage: "ubuntu-18.04"
TestTargetFramework: netcoreapp2.1
Windows_NetCoreApp:
DotNetCoreRuntimeVersion: $(DotNetCoreRuntimeVersion2.1)
Linux_NetCoreApp3.1:
OSName: "Linux"
OSVmImage: "ubuntu-18.04"
TestTargetFramework: netcoreapp3.1
DotNetCoreRuntimeVersion: $(DotNetCoreRuntimeVersion3.1)
Windows_NetCoreApp2.1:
OSName: "Windows"
OSVmImage: "windows-2019"
TestTargetFramework: netcoreapp2.1
Windows_NetCoreApp_ProjectReferences:
DotNetCoreRuntimeVersion: $(DotNetCoreRuntimeVersion2.1)
Windows_NetCoreApp3.1:
OSName: "Windows"
OSVmImage: "windows-2019"
TestTargetFramework: netcoreapp3.1
DotNetCoreRuntimeVersion: $(DotNetCoreRuntimeVersion3.1)
Windows_NetCoreApp2.1_ProjectReferences:
OSName: "Windows"
OSVmImage: "windows-2019"
TestTargetFramework: netcoreapp2.1
DotNetCoreRuntimeVersion: $(DotNetCoreRuntimeVersion2.1)
ConvertToProjectReferenceOption: /p:UseProjectReferenceToAzureClients=true
Windows_NetCoreApp3.1_ProjectReferences:
OSName: "Windows"
OSVmImage: "windows-2019"
TestTargetFramework: netcoreapp3.1
DotNetCoreRuntimeVersion: $(DotNetCoreRuntimeVersion3.1)
ConvertToProjectReferenceOption: /p:UseProjectReferenceToAzureClients=true
Windows_NetFramework:
OSName: "Windows"
OSVmImage: "windows-2019"
TestTargetFramework: net461
MacOs:
DotNetCoreRuntimeVersion: $(DotNetCoreRuntimeVersion2.1)
MacOs_NetCoreApp2.1:
OSName: "MacOS"
OSVmImage: "macOS-10.15"
TestTargetFramework: netcoreapp2.1
DotNetCoreRuntimeVersion: $(DotNetCoreRuntimeVersion2.1)
MacOs_NetCoreApp3.1:
OSName: "MacOS"
OSVmImage: "macOS-10.15"
TestTargetFramework: netcoreapp3.1
DotNetCoreRuntimeVersion: $(DotNetCoreRuntimeVersion3.1)
pool:
vmImage: "$(OSVmImage)"
steps:
- template: eng/pipelines/templates/scripts/verify-agent-os.yml@azure-sdk-tools
parameters:
OSName: $(OSName)
- task: DotNetCoreInstaller@2
- task: UseDotNet@2
displayName: "Use .NET Core runtime $(DotNetCoreRuntimeVersion)"
inputs:
packageType: runtime
version: "$(DotNetCoreRuntimeVersion)"
- task: DotNetCoreInstaller@2
- task: UseDotNet@2
displayName: "Use .NET Core sdk $(DotNetCoreSDKVersion)"
inputs:
packageType: sdk
Expand Down
38 changes: 34 additions & 4 deletions eng/pipelines/templates/jobs/archetype-sdk-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,61 @@ jobs:
strategy:
maxParallel: ${{ parameters.MaxParallel }}
matrix:
Linux:
Linux_NetCoreApp2.1:
OSName: "Linux"
OSVmImage: "ubuntu-18.04"
TestTargetFramework: netcoreapp2.1
DotNetCoreRuntimeVersion: $(DotNetCoreRuntimeVersion2.1)
CloudType: AzureCloud
Windows_NetCoreApp:
Linux_NetCoreApp3.1:
OSName: "Linux"
OSVmImage: "ubuntu-18.04"
TestTargetFramework: netcoreapp3.1
DotNetCoreRuntimeVersion: $(DotNetCoreRuntimeVersion3.1)
CloudType: AzureCloud
Windows_NetCoreApp2.1:
OSName: "Windows"
OSVmImage: "windows-2019"
TestTargetFramework: netcoreapp2.1
DotNetCoreRuntimeVersion: $(DotNetCoreRuntimeVersion2.1)
CloudType: AzureCloud
Windows_NetCoreApp_ProjectReferences:
Windows_NetCoreApp3.1:
OSName: "Windows"
OSVmImage: "windows-2019"
TestTargetFramework: netcoreapp3.1
DotNetCoreRuntimeVersion: $(DotNetCoreRuntimeVersion3.1)
CloudType: AzureCloud
Windows_NetCoreApp2.1_ProjectReferences:
OSName: "Windows"
OSVmImage: "windows-2019"
TestTargetFramework: netcoreapp2.1
DotNetCoreRuntimeVersion: $(DotNetCoreRuntimeVersion2.1)
CloudType: AzureCloud
ConvertToProjectReferenceOption: /p:UseProjectReferenceToAzureClients=true
Windows_NetCoreApp3.1_ProjectReferences:
OSName: "Windows"
OSVmImage: "windows-2019"
TestTargetFramework: netcoreapp3.1
DotNetCoreRuntimeVersion: $(DotNetCoreRuntimeVersion3.1)
CloudType: AzureCloud
ConvertToProjectReferenceOption: /p:UseProjectReferenceToAzureClients=true
Windows_NetFramework:
OSName: "Windows"
OSVmImage: "windows-2019"
TestTargetFramework: net461
DotNetCoreRuntimeVersion: $(DotNetCoreRuntimeVersion2.1)
CloudType: AzureCloud
MacOs:
MacOs_NetCoreApp2.1:
OSName: "MacOS"
OSVmImage: "macOS-10.15"
TestTargetFramework: netcoreapp2.1
DotNetCoreRuntimeVersion: $(DotNetCoreRuntimeVersion2.1)
CloudType: AzureCloud
MacOs_NetCoreApp3.1:
OSName: "MacOS"
OSVmImage: "macOS-10.15"
TestTargetFramework: netcoreapp3.1
DotNetCoreRuntimeVersion: $(DotNetCoreRuntimeVersion3.1)
CloudType: AzureCloud
pool:
vmImage: "$(OSVmImage)"
Expand Down
5 changes: 3 additions & 2 deletions eng/pipelines/templates/variables/globals.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
variables:
DocWardenVersion: '0.5.0'
DotNetCoreSDKVersion: '3.1.100'
DotNetCoreRuntimeVersion: '2.1.10'
DotNetCoreSDKVersion: '3.1.201'
DotNetCoreRuntimeVersion2.1: '2.1.17'
DotNetCoreRuntimeVersion3.1: '3.1.3'
OfficialBuildId: $(Build.BuildNumber)
ConvertToProjectReferenceOption: ''
skipComponentGovernanceDetection: true
Expand Down
4 changes: 4 additions & 0 deletions ....Messaging.EventHubs.Processor/samples/Azure.Messaging.EventHubs.Processor.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,8 @@
<ItemGroup>
<ProjectReference Include="..\src\Azure.Messaging.EventHubs.Processor.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NETCore.Targets" PrivateAssets="all" />
Copy link
Member

@weshaggard weshaggard May 8, 2020

Choose a reason for hiding this comment

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

What is this needed for?

Copy link
Member Author

@chidozieononiwu chidozieononiwu May 8, 2020

Choose a reason for hiding this comment

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

I was following instructions here to try and fix NuGet Error NU1605 that was occurring in Azure.Messaging.EventHubs.Processor.Samples

Copy link
Member

@weshaggard weshaggard May 8, 2020

Choose a reason for hiding this comment

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

I don't think this is the right solution. Can you show the exact error you were hitting?

</ItemGroup>
</Project>