Skip to content

Cleanup Helix infrastructure slightly #32554

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 3 commits into from
May 11, 2021
Merged

Cleanup Helix infrastructure slightly #32554

merged 3 commits into from
May 11, 2021

Conversation

dougbu
Copy link
Contributor

@dougbu dougbu commented May 10, 2021

  • remove unused $(HelixUseArchive) property

  • move helix.proj output into artifacts/bin/helix/

    • remove $(Configuration) and $(PlatformName) from output path
      • other layouts aren't that specific
      • properties weren't available anyhow in some cases

    nits:

    • provide the .version file expected in .dotnet/shared/…
    • rename AspNetCoreAppRuntimeHelix/ -> SharedFx.Layout/; same for the correlation payload archive
    • rename AspNetCoreAppRuntimeHelixRaw/ -> SharedFx.Unzip/
  • support added msbuild arguments in RunHelix.ps1
    nit: use [switch] instead of [bool]

dougbu added 3 commits May 10, 2021 15:08
- remove `$(Configuration)` and `$(PlatformName)` from output path
  - other layouts aren't that specific
  - properties weren't available anyhow in some cases

nits:
- provide the .version file expected in .dotnet/shared/…
- rename `AspNetCoreAppRuntimeHelix/` -> `SharedFx.Layout/`; same for the correlation payload archive
- rename `AspNetCoreAppRuntimeHelixRaw/` -> `SharedFx.Unzip/`
nit: use `[switch]` instead of `[bool]`
@dougbu dougbu requested a review from a team as a code owner May 10, 2021 22:15
@ghost ghost added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label May 10, 2021
@dougbu dougbu requested a review from HaoK May 10, 2021 22:15
@dougbu
Copy link
Contributor Author

dougbu commented May 10, 2021

/fyi issues found while playing in #32508 (my playground for testing @davidwrighton's #31778)

@@ -120,11 +120,6 @@
</PropertyGroup>
</Target>

<Target Name="_PublishHelixArchive" DependsOnTargets="Publish" >
Copy link
Member

Choose a reason for hiding this comment

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

I vaguely recall IIS functional tests using this, or at least this is why it was added, did they move to something else?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There are no mentions of this target in the repo after removing this. And, nothing remained that set $(HelixUseArchive) to true before I started. @jkotalik was the "archiving for IIS tests on Helix" requirement removed at some point❔

@dougbu
Copy link
Contributor Author

dougbu commented May 10, 2021

Green. Just waiting for approval…

@dougbu dougbu merged commit 0551cef into main May 11, 2021
@dougbu dougbu deleted the dougbu/quick.helix.cleanup branch May 11, 2021 02:10
@ghost ghost added this to the 6.0-preview5 milestone May 11, 2021
dougbu added a commit that referenced this pull request May 27, 2021
- cherry-pick of #32894

* Clean out Ubuntu 16.04 testing
  - use Ubuntu 18.04 agents for testing in Docker containers on Helix
  - also move to supported version of Fedora

* Support added `msbuild` arguments in RunHelix.ps1
  - bring in part of 0551cef (#32554)
  - no reason to maintain major differences from main version of script
    - slight difference is we still test on Windows.10.Amd64.Open by default here

nits:
- clean up a few old mentions of Centos and Fedora testing
- fix `%(Platform)` metadata for OSX `@(HelixAvailableTargetQueue)` items
- pick up a small bit of the master -> main renaming improvements
- use `[switch]` instead of `[bool]` in RunHelix.ps1 parameters
dougbu added a commit that referenced this pull request Jun 1, 2021
* [release/5.0] Clean out Ubuntu 16.04 testing
- cherry-pick of #32894

* Clean out Ubuntu 16.04 testing
  - use Ubuntu 18.04 agents for testing in Docker containers on Helix
  - also move to supported version of Fedora

* Support added `msbuild` arguments in RunHelix.ps1
  - bring in part of 0551cef (#32554)
  - no reason to maintain major differences from main version of script
    - slight difference is we still test on Windows.10.Amd64.Open by default here

nits:
- clean up a few old mentions of Centos and Fedora testing
- fix `%(Platform)` metadata for OSX `@(HelixAvailableTargetQueue)` items
- pick up a small bit of the master -> main renaming improvements
- use `[switch]` instead of `[bool]` in RunHelix.ps1 parameters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants