-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Adding initial Helix support #802
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.
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
Merged
Changes from all commits
Commits
Show all changes
73 commits
Select commit
Hold shift + click to select a range
de9098a
adding initial helix support
stevenbrix 70a4fb2
move to using Microsoft.DotNet.Wpf.DncEng.Test package name
stevenbrix 407e32f
Add target queues
stevenbrix 8d3c7b6
run test in powershell script
stevenbrix 688c351
updating dependencies and removing workaround
stevenbrix 80df343
adding documentation
stevenbrix d7c04b9
reverting dependency update
stevenbrix 3e9542a
switching back to true DrtXaml
stevenbrix 7c9221b
prepare helix payload with DRT
stevenbrix 6901ece
add source link for deterministic source path issue
stevenbrix 97a0e0b
remove explicit platform and extra file added
stevenbrix 263db42
fixing up targets/props so we can build with -test
stevenbrix a6f098a
tests properly running and reporting results
stevenbrix b3c32c2
a little cleaning up
stevenbrix 3d1efd8
fix creating payload directory
stevenbrix 66cc44c
put test directory back to how it is when restoring via msbuild
stevenbrix bd197d4
updating dependencies
stevenbrix 4a5584f
adding all helix queues
stevenbrix affa661
running tests with build -test
stevenbrix 43e467c
fixing DrtXaml
stevenbrix c51f852
don't use publish
stevenbrix d5fb705
updating documentation
stevenbrix a0af0d3
fixing typo
stevenbrix 4749209
responding to pr feedback
stevenbrix 3d1f2d8
updating injectmoduleinitializer
stevenbrix 2c91ec5
fix batching
stevenbrix 91725b1
add back workaround for missing WindowsDesktop
stevenbrix 42ae287
add WindowsDesktop package to payload for CI builds
stevenbrix 8379bca
ensure ResolveFrameworkReferences actually works
stevenbrix 95b29c3
workaround no windowsdesktop install on helix machine
stevenbrix 4c70764
updating developer documentation
stevenbrix 5792d0d
allow for looking outside of local dotnet install
stevenbrix 6137908
Suppress all GUI from IL(D)Asm calls. (#877)
rladuca 1798ea5
Don't generate ref assemblies for WPF extension assemblies (#879)
ryalanms 106bd21
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] fa1e85b
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] 0c45469
Update dependencies from https://github.com/dotnet/winforms build 201…
dotnet-maestro[bot] 49513e1
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-maestro[bot] 3d3a172
Remove workaround for https://github.com/dotnet/corefx/issues/32641. …
rladuca 8fb5dce
upload drt results in helix run
stevenbrix f7fc9f2
adding initial helix support
stevenbrix 29721fd
move to using Microsoft.DotNet.Wpf.DncEng.Test package name
stevenbrix 5421acf
Add target queues
stevenbrix 070f0d5
run test in powershell script
stevenbrix 847d4ef
updating dependencies and removing workaround
stevenbrix b21ed79
adding documentation
stevenbrix 2e6ea44
reverting dependency update
stevenbrix 56087ee
switching back to true DrtXaml
stevenbrix 8c5ec10
prepare helix payload with DRT
stevenbrix a501014
add source link for deterministic source path issue
stevenbrix 5222a87
remove explicit platform and extra file added
stevenbrix f3b4f5b
fixing up targets/props so we can build with -test
stevenbrix 0a564c7
tests properly running and reporting results
stevenbrix c14bb3d
a little cleaning up
stevenbrix 04d7e3d
fix creating payload directory
stevenbrix b2c9308
put test directory back to how it is when restoring via msbuild
stevenbrix d1aa7dd
updating dependencies
stevenbrix 42d1280
adding all helix queues
stevenbrix 4b5da99
running tests with build -test
stevenbrix 77673c1
fixing DrtXaml
stevenbrix b9281ab
don't use publish
stevenbrix a2ec5b8
updating documentation
stevenbrix 9bec654
fixing typo
stevenbrix a08952d
responding to pr feedback
stevenbrix ed35be0
updating injectmoduleinitializer
stevenbrix 9bfaccc
fix batching
stevenbrix f64744a
add back workaround for missing WindowsDesktop
stevenbrix 61d53a8
add WindowsDesktop package to payload for CI builds
stevenbrix d8b1f90
ensure ResolveFrameworkReferences actually works
stevenbrix 6764712
workaround no windowsdesktop install on helix machine
stevenbrix 3c1d326
updating developer documentation
stevenbrix b537264
allow for looking outside of local dotnet install
stevenbrix c93d0e9
cleaning up runtests.ps1
stevenbrix File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| # Testing in Helix | ||
|
|
||
| I'd recommend seeing the official Helix [readme](https://github.com/dotnet/arcade/blob/master/src/Microsoft.DotNet.Helix/Sdk/Readme.md) if you are interested in some of the general Helix concepts. I'll briefly outline what we are doing that is a bit unique: | ||
|
|
||
| 1. Helix has built-in support for running xUnit tests. Since we are not using xUnit, we have to manually setup our machines so that they work with QualityVault and STI. During the build, we create a payload directory that contains the infrastructure we need. A single project (in our case `DrtXaml`) is responsible for creating this directory (see instances of the MSBuild property `CreateTestPayload`). | ||
| 2. After the build is done, we utilize Arcade's `AfterSolutionBuild.targets` extension point to finish creating the rest of the payload if the `-test` parameter is passed to the build. Here we add the just built DRTs and if `-ci` was **not** passed into to the build, run the tests. | ||
| 3. Helix allows you to specify a `HelixCorrelationPayload` directory, where this directory gets deployed to the Helix machine, and is made available in your various helix commands with the `HELIX_CORRELATION_PAYLOAD` environment variable. We use the payload directory created described above. | ||
| 4. Helix and Azure Pipelines can report xUnit logs, so we will be updating QualityVault to produce an xUnit compatible log. We will then need to copy that log to a known location for it to be picked up. This location can be in any subfolder of the `HelixWorkItem` working directory. | ||
|
|
||
| ## How we are running tests | ||
| 1. Currently, the `HelixQueues` that we selected are Windows.10.Amd64.Open;Windows.7.Amd64.Open;Windows.10.Amd64.ServerRS5.Open. Essentially, this translates to: "Latest Windows 10", "Windows 7", and "Windows 10 RS5 Server" addition. This enables tests to run on some of the most interesting and important SKUs, without overloading the Helix servers and/or making CI runs take an unnecessarily long time to run. | ||
| 2. In a similar fashion, we only run test passes for Release builds, mainly to save time and resources running duplicate tests in a near-identical environment. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| <Project> | ||
| <Import Project="$(MSBuildThisFileDirectory)WpfArcadeSdk\tools\RunDrtsLocal.targets" Condition="'$(Test)'=='True'" /> | ||
rladuca marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| </Project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,99 +1,103 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Dependencies> | ||
| <ProductDependencies> | ||
| <Dependency Name="Microsoft.Private.Winforms" Version="4.8.0-preview7.19304.2"> | ||
| <Dependency Name="Microsoft.Private.Winforms" Version="4.8.0-preview7.19305.1"> | ||
| <Uri>https://github.com/dotnet/winforms</Uri> | ||
| <Sha>f59e9a9dde144098bb58365f210dfdf4acc9e693</Sha> | ||
| <Sha>e65ecacdf2da06f11c847571b467f632393bd060</Sha> | ||
| </Dependency> | ||
| </ProductDependencies> | ||
| <ToolsetDependencies> | ||
| <Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Uri>https://github.com/dotnet/corefx</Uri> | ||
| <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha> | ||
| <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha> | ||
| </Dependency> | ||
| <Dependency Name="System.CodeDom" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Dependency Name="System.CodeDom" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Uri>https://github.com/dotnet/corefx</Uri> | ||
| <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha> | ||
| <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha> | ||
| </Dependency> | ||
| <Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Uri>https://github.com/dotnet/corefx</Uri> | ||
| <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha> | ||
| <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha> | ||
| </Dependency> | ||
| <Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Uri>https://github.com/dotnet/corefx</Uri> | ||
| <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha> | ||
| <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha> | ||
| </Dependency> | ||
| <Dependency Name="System.DirectoryServices" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Dependency Name="System.DirectoryServices" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Uri>https://github.com/dotnet/corefx</Uri> | ||
| <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha> | ||
| <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha> | ||
| </Dependency> | ||
| <Dependency Name="System.Drawing.Common" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Dependency Name="System.Drawing.Common" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Uri>https://github.com/dotnet/corefx</Uri> | ||
| <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha> | ||
| <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha> | ||
| </Dependency> | ||
| <Dependency Name="System.Reflection.Emit" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Dependency Name="System.Reflection.Emit" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Uri>https://github.com/dotnet/corefx</Uri> | ||
| <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha> | ||
| <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha> | ||
| </Dependency> | ||
| <Dependency Name="System.Reflection.MetadataLoadContext" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Dependency Name="System.Reflection.MetadataLoadContext" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Uri>https://github.com/dotnet/corefx</Uri> | ||
| <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha> | ||
| <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha> | ||
| </Dependency> | ||
| <Dependency Name="System.Security.AccessControl" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Dependency Name="System.Security.AccessControl" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Uri>https://github.com/dotnet/corefx</Uri> | ||
| <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha> | ||
| <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha> | ||
| </Dependency> | ||
| <Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Uri>https://github.com/dotnet/corefx</Uri> | ||
| <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha> | ||
| <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha> | ||
| </Dependency> | ||
| <Dependency Name="System.Security.Permissions" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Dependency Name="System.Security.Permissions" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Uri>https://github.com/dotnet/corefx</Uri> | ||
| <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha> | ||
| <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha> | ||
| </Dependency> | ||
| <Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Uri>https://github.com/dotnet/corefx</Uri> | ||
| <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha> | ||
| <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha> | ||
| </Dependency> | ||
| <Dependency Name="System.Windows.Extensions" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Dependency Name="System.Windows.Extensions" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Uri>https://github.com/dotnet/corefx</Uri> | ||
| <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha> | ||
| <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha> | ||
| </Dependency> | ||
| <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview7-27804-03"> | ||
| <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview7-27805-02"> | ||
| <Uri>https://github.com/dotnet/core-setup</Uri> | ||
| <Sha>a620d0dba57cd18e49fa686e28e18369be23d067</Sha> | ||
| <Sha>2e54d1f6a6a9126126d6c9f8d730489892acf730</Sha> | ||
| </Dependency> | ||
| <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19304.23"> | ||
| <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19305.13"> | ||
| <Uri>https://github.com/dotnet/arcade</Uri> | ||
| <Sha>c9ab9c47d6c66fb9ad89e331900e06bed7463904</Sha> | ||
| <Sha>d05c046913964e880be08b804e7249f297617c2f</Sha> | ||
| </Dependency> | ||
| <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19304.23"> | ||
| <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19305.13"> | ||
| <Uri>https://github.com/dotnet/arcade</Uri> | ||
| <Sha>c9ab9c47d6c66fb9ad89e331900e06bed7463904</Sha> | ||
| <Sha>d05c046913964e880be08b804e7249f297617c2f</Sha> | ||
| </Dependency> | ||
| <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Uri>https://github.com/dotnet/corefx</Uri> | ||
| <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha> | ||
| <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha> | ||
| </Dependency> | ||
| <Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="4.8.0-preview7.19304.6"> | ||
| <Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="4.8.0-preview7.19305.10"> | ||
| <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri> | ||
| <Sha>24fbf672601b7b9c088abed2e850bfe14a69875f</Sha> | ||
| <Sha>76e5819b43718069ef5710a08032b616de5d754c</Sha> | ||
| </Dependency> | ||
| <Dependency Name="System.IO.Packaging" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Dependency Name="System.IO.Packaging" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Uri>https://github.com/dotnet/corefx</Uri> | ||
| <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha> | ||
| <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha> | ||
| </Dependency> | ||
| <Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-preview7.19304.2" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-preview7.19305.2" CoherentParentDependency="Microsoft.NETCore.App"> | ||
| <Uri>https://github.com/dotnet/coreclr</Uri> | ||
| <Sha>89df4b9d928c7f21550d487328f5db000a498bdf</Sha> | ||
| <Sha>10df20ed3ff0208b3f16f79d5062662a8827f579</Sha> | ||
| </Dependency> | ||
| <Dependency Name="Microsoft.NETCore.ILDAsm" Version="3.0.0-preview7.19304.2" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR"> | ||
| <Dependency Name="Microsoft.NETCore.ILDAsm" Version="3.0.0-preview7.19305.2" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR"> | ||
| <Uri>https://github.com/dotnet/coreclr</Uri> | ||
| <Sha>89df4b9d928c7f21550d487328f5db000a498bdf</Sha> | ||
| <Sha>10df20ed3ff0208b3f16f79d5062662a8827f579</Sha> | ||
| </Dependency> | ||
| <Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview7.19304.2" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR"> | ||
| <Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview7.19305.2" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR"> | ||
| <Uri>https://github.com/dotnet/coreclr</Uri> | ||
| <Sha>89df4b9d928c7f21550d487328f5db000a498bdf</Sha> | ||
| <Sha>10df20ed3ff0208b3f16f79d5062662a8827f579</Sha> | ||
| </Dependency> | ||
| <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19278.1"> | ||
| <Uri>https://github.com/dotnet/arcade</Uri> | ||
| <Sha>11f90a2a260422201895de58e57170131ab4efe7</Sha> | ||
| </Dependency> | ||
| </ToolsetDependencies> | ||
| </Dependencies> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.