Skip to content

Give tvOS a special value for Personal/MyDocuments #57508

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
directhex merged 36 commits into from
Aug 24, 2021
Merged

Give tvOS a special value for Personal/MyDocuments #57508

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
6354dd0
Use a different Personal folder on tvOS, and a test that it works
Aug 16, 2021
0ee7a71
Run this PR on device, the error does not happen on sim
Aug 16, 2021
5854dfc
CI fixes
Aug 16, 2021
7473c19
Nullable
Aug 16, 2021
877258f
Test on devices
Aug 16, 2021
b032fc0
Just run one test to save disk space
Aug 16, 2021
43573f7
Tweak to run only 1 test and make sure DevTeamProvisioning is right
Aug 17, 2021
a39e472
Horrible hack to check something in CI
Aug 17, 2021
392a09b
Merge branch 'tvos-specialdirectories' of github.com:directhex/runtim…
Aug 17, 2021
cfcb6dc
Revert all changes. Run as-is in CI to see if it's my changes to blame
Aug 17, 2021
c50a1af
nonsense
Aug 17, 2021
7e7d49b
Set temp path to a valid location
Aug 18, 2021
064670d
Fix AppDomainTests.ExecuteAssembly to copy files to a valid place
Aug 18, 2021
a48cfe7
Don't expect HOME to work on tvOS
Aug 18, 2021
26354d7
We cannot get exit code from tvOS device, so runonly tests don't work
Aug 18, 2021
4ee0555
Revert infra changes made to enable CI of this PR, which passes now o…
Aug 18, 2021
75bf9e2
Merge remote-tracking branch 'origin/main' into tvos-specialdirectories
Aug 18, 2021
07660e2
Add NSTemporaryDirectory interop function and supporting cast
Aug 18, 2021
e57d693
Merge remote-tracking branch 'origin/tvos-specialdirectories' into tv…
Aug 18, 2021
4b49b07
forgot a void
Aug 19, 2021
84609fc
Requested changes from Alex
Aug 19, 2021
b936dc1
Merge remote-tracking branch 'origin/main' into tvos-specialdirectories
Aug 20, 2021
5ad98b9
Merge remote-tracking branch 'origin/main' into tvos-specialdirectories
Aug 23, 2021
9ebb6b0
Don't use nullable
Aug 23, 2021
fc2cf38
Revert AppDominTests changes, not clear they're needed
Aug 23, 2021
74ddcff
namespace
Aug 23, 2021
a619fa7
Update src/libraries/System.Private.CoreLib/src/System/IO/Path.Unix.i…
directhex Aug 23, 2021
33788e1
Revert unused props
Aug 23, 2021
a3d96ed
Update src/libraries/System.Private.CoreLib/src/System/IO/Path.Unix.i…
directhex Aug 23, 2021
0baf69f
Update src/libraries/System.Private.CoreLib/src/System/IO/Path.Unix.i…
directhex Aug 23, 2021
e85a9e4
Update src/libraries/System.Private.CoreLib/src/System/IO/Path.Unix.i…
directhex Aug 23, 2021
6f338fa
Update src/libraries/System.Private.CoreLib/src/System/IO/Path.Unix.N…
directhex Aug 23, 2021
eb5706a
Changes squashing other changes, bleh
Aug 23, 2021
67a6c1d
Update src/libraries/System.Private.CoreLib/src/System/IO/Path.Unix.i…
directhex Aug 23, 2021
e3cbd8c
error CA1805: Member 's_defaultTempPath' is explicitly initialized to…
Aug 23, 2021
538b631
Merge remote-tracking branch 'origin/main' into tvos-specialdirectories
Aug 23, 2021
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
Prev Previous commit
Next Next commit
Tweak to run only 1 test and make sure DevTeamProvisioning is right
  • Loading branch information
Steve Pfister committed Aug 17, 2021
commit 43573f74fa9f7324a89e89d60b55535e97f3fcd9
1 change: 1 addition & 0 deletions eng/testing/tests.mobile.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@

<PropertyGroup>
<DevTeamProvisioning Condition="'$(TargetOS)' == 'MacCatalyst' and '$(DevTeamProvisioning)' == ''">adhoc</DevTeamProvisioning>
<DevTeamProvisioning Condition="('$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS') and '$(DevTeamProvisioning)' == ''">-</DevTeamProvisioning>
</PropertyGroup>

<Target Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator'" Name="BundleTestAppleApp" DependsOnTargets="GenerateRuntimeConfig">
Expand Down
15 changes: 12 additions & 3 deletions src/libraries/tests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj" />
</ItemGroup>

<ItemGroup Condition="('$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator') and '$(RunDisablediOSTests)' != 'true'">
<ItemGroup Condition="'$(TargetOS)' == 'tvOSSimulator' and '$(RunDisablediOSTests)' != 'true'">
<!-- https://github.com/dotnet/runtime/issues/50589 -->
<ProjectExclusions Include="$(RepoRoot)\src\tests\FunctionalTests\tvOS\Simulator\AOT\tvOS.Simulator.Aot.Test.csproj" />

Expand Down Expand Up @@ -300,7 +300,10 @@
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)*\tests\**\System.Runtime.Extensions.Tests.csproj"
Exclude="@(ProjectExclusions)"
Condition="'$(TestAssemblies)' == 'true'" />
Condition="'$(TargetOS)' == 'tvOS' and '$(TestAssemblies)' == 'true'" />
<ProjectReference Include="$(MSBuildThisFileDirectory)*\tests\**\*.Tests.csproj"
Exclude="@(ProjectExclusions)"
Condition="'$(TargetOS)' != 'tvOS' and '$(TestAssemblies)' == 'true'" />
<ProjectReference Include="$(MSBuildThisFileDirectory)testPackages\testPackages.proj"
Condition="'$(TestPackages)' == 'true'" />
<TrimmingTestProjects Include="$(MSBuildThisFileDirectory)*\tests\**\*.TrimmingTests.proj"
Expand All @@ -327,12 +330,18 @@
BuildInParallel="false" />
</ItemGroup>

<ItemGroup Condition="'$(ArchiveTests)' == 'true' and ('$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator')">
<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(TargetOS)' == 'tvOSSimulator'">
<ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\tvOS\**\*.Test.csproj"
Exclude="@(ProjectExclusions)"
BuildInParallel="false" />
</ItemGroup>

<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(TargetOS)' == 'tvOS'">
<ProjectReference Include="$(RepoRoot)\src\tests\FunctionalTests\tvOS\Simulator\AOT\tvOS.Simulator.Aot.Test.csproj"
Exclude="@(ProjectExclusions)"
BuildInParallel="false" />
</ItemGroup>

<ItemGroup Condition="'$(ArchiveTests)' == 'true' and '$(TargetOS)' == 'Android'">
<ProjectReference Include="$(MonoProjectRoot)sample\Android\AndroidSampleApp.csproj"
BuildInParallel="false" />
Expand Down