Skip to content

[main] Update dependencies from dotnet/arcade #3022

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

Merged
dotnet-maestro merged 6 commits into from
Mar 31, 2022
Merged

[main] Update dependencies from dotnet/arcade #3022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
11c21de
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Mar 29, 2022
9e3cd0c
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Mar 29, 2022
97a58a8
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Mar 31, 2022
038c04c
Add new sdk to helix steps
riarenas Mar 31, 2022
f8ba915
.NET 7 all the things
riarenas Mar 31, 2022
ad066a7
update docker container used
riarenas Mar 31, 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
6 changes: 3 additions & 3 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ schedules:
resources:
containers:
- container: LinuxContainer
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-cross-0cd4667-20170319080304
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-20210714125435-9b5bbc2

stages:
- stage: build
Expand Down Expand Up @@ -166,10 +166,10 @@ stages:
XUnitProjects: $(Build.SourcesDirectory)/src/Validation/tests/Validation.Tests.csproj
XUnitTargetFramework: netcoreapp2.0
XUnitRunnerVersion: 2.4.2-pre.9
XUnitPublishTargetFramework: net6.0
XUnitPublishTargetFramework: net7.0
IncludeDotNetCli: true
DotNetCliPackageType: sdk
DotNetCliVersion: 6.0.100
DotNetCliVersion: 7.0.100-preview.2.22153.17
EnableXUnitReporter: true
WaitForWorkItemCompletion: true
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
Expand Down
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22179.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22181.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
<Sha>82e8ceb1749ec927b1d493d6e4d23d56d70fb3fa</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22179.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22181.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
<Sha>82e8ceb1749ec927b1d493d6e4d23d56d70fb3fa</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "6.0.100",
"dotnet": "7.0.100-preview.2.22153.17",
"runtimes": {
"dotnet": [
"2.1.11"
Expand All @@ -12,7 +12,7 @@
"cmake-test": "3.11.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22179.1",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22179.1"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22181.1",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22181.1"
}
}
2 changes: 1 addition & 1 deletion src/Validation/src/Validation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net7.0</TargetFrameworks>
<IsPackable>true</IsPackable>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Validation/tests/Validation.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net7.0</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down