Skip to content

[main] Update dependencies from dotnet/arcade #851

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 8 commits into from
Apr 4, 2022
Merged

[main] Update dependencies from dotnet/arcade #851

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
75e7db8
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Apr 1, 2022
ce10407
.NET 7 all the things
premun Apr 1, 2022
a32fc06
.NET 7 test projects
premun Apr 1, 2022
21e965b
TargetFrameworks
premun Apr 1, 2022
0f8cbd9
Do .NET 7 only
premun Apr 1, 2022
27e7050
Try multi-targeting + fix ADB/mlaunch targets
premun Apr 4, 2022
86c6837
Fix target dependencies
premun Apr 4, 2022
cbf8774
Fix README
premun Apr 4, 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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,11 @@ The easiest way to get these at the moment for development purposes is to build
dotnet build src/Microsoft.DotNet.XHarness.CLI/Microsoft.DotNet.XHarness.CLI.csproj
```

You can then find these dependencies in `artifacts/obj/Microsoft.DotNet.XHarness.CLI/Debug/net6.0`.
You can then find these dependencies in `artifacts/obj/Microsoft.DotNet.XHarness.CLI/`.

For iOS flows, you can further store the path to mlaunch to an environmental variable `XHARNESS_MLAUNCH_PATH`
```
export XHARNESS_MLAUNCH_PATH='[xharness root]/artifacts/obj/Microsoft.DotNet.XHarness.CLI/Debug/net6.0/mlaunch/bin/mlaunch'
export XHARNESS_MLAUNCH_PATH='[xharness root]/artifacts/obj/Microsoft.DotNet.XHarness.CLI/mlaunch/bin/mlaunch'
```
and you won't have to specify the `--mlaunch` argument.

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.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
<Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</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.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1527dc867ccb652def4c0f57fbd2ebbed3a94019</Sha>
<Sha>e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a</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,9 +1,9 @@
{
"tools": {
"dotnet": "6.0.100"
"dotnet": "7.0.100-preview.2.22153.17"
},
"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.2",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22181.2"
}
}
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.XHarness.Android/Microsoft.DotNet.XHarness.Android.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>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<nullable>enable</nullable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.XHarness.Apple/Microsoft.DotNet.XHarness.Apple.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>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
Expand Down
9 changes: 5 additions & 4 deletions src/Microsoft.DotNet.XHarness.CLI/Microsoft.DotNet.XHarness.CLI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<Nullable>enable</Nullable>
<IsPackable>true</IsPackable>
<PackAsTool>true</PackAsTool>
<ToolCommandName>xharness</ToolCommandName>
<RollForward>Major</RollForward>
<!-- Mono.Options is apparently not strong-name signed -->
<NoWarn>CS8002;</NoWarn>

<MlaunchDestinationDir>$(BaseIntermediateOutputPath)/mlaunch</MlaunchDestinationDir>

<!-- When updating these URLs, avoid using 'latest' url as these are redirects and can make the same commit build differently on different days -->
Expand Down Expand Up @@ -60,7 +60,7 @@
<RemoveDir Directories="$(BaseIntermediateOutputPath)/android-tools-unzipped/windows/platform-tools/systrace;$(BaseIntermediateOutputPath)/android-tools-unzipped/linux/platform-tools/systrace;$(BaseIntermediateOutputPath)/android-tools-unzipped/macos/platform-tools/systrace" />
</Target>

<Target Name="IncludeAdb" BeforeTargets="Build" DependsOnTargets="DownloadAdb">
<Target Name="IncludeAdb" BeforeTargets="DispatchToInnerBuilds" DependsOnTargets="DownloadAdb">
<ItemGroup>
<WindowsAdbFiles Include="$(BaseIntermediateOutputPath)/android-tools-unzipped/windows/platform-tools/adb.exe" />
<WindowsAdbFiles Include="$(BaseIntermediateOutputPath)/android-tools-unzipped/windows/platform-tools/AdbWinApi.dll" />
Expand All @@ -86,7 +86,8 @@
</Target>

<!-- The ExtractMlaunch target comes from the Mlaunch NuGet package and places files in the obj/ dir -->
<Target Name="IncludeMlaunch" BeforeTargets="Build" DependsOnTargets="ExtractMlaunch">
<!-- This target used to depend on ExtractMlaunch but it broke when we started multi-targeting XHarness -->
<Target Name="IncludeMlaunch" BeforeTargets="_GetPackageFiles">
<ItemGroup>
<Content Include="$(BaseIntermediateOutputPath)/mlaunch/**/*.*">
<Pack>true</Pack>
Expand Down
2 changes: 1 addition & 1 deletion ...InstrumentationBase.Xunit/Microsoft.DotNet.XHarness.DefaultAndroidEntryPoint.Xunit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<IsPackable>true</IsPackable>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<nullable>enable</nullable>
<RootNamespace>Microsoft.DotNet.XHarness.TestRunners.Xunit</RootNamespace>
<OutputType>Library</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion tests/Microsoft.DotNet.XHarness.Android.Tests/Microsoft.DotNet.XHarness.Android.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>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion tests/Microsoft.DotNet.XHarness.Apple.Tests/Microsoft.DotNet.XHarness.Apple.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>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<IsPackable>false</IsPackable>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/Microsoft.DotNet.XHarness.CLI.Tests/Microsoft.DotNet.XHarness.CLI.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>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<IsPackable>false</IsPackable>
<!-- Mono.Options is apparently not strong-name signed -->
<NoWarn>CS8002;</NoWarn>
Expand Down
2 changes: 1 addition & 1 deletion tests/Microsoft.DotNet.XHarness.Common.Tests/Microsoft.DotNet.XHarness.Common.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>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<IsPackable>false</IsPackable>
<!-- Mono.Options is apparently not strong-name signed -->
<NoWarn>CS8002;</NoWarn>
Expand Down
2 changes: 1 addition & 1 deletion ...soft.DotNet.XHarness.TestRunners.Tests/Microsoft.DotNet.XHarness.TestRunners.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>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...rosoft.DotNet.XHarness.iOS.Shared.Tests/Microsoft.DotNet.XHarness.iOS.Shared.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>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down