Skip to content

[release/7.0] [wasm] Templates nits - #76373

Merged
carlossanlop merged 6 commits into
release/7.0from
backport/pr-76182-to-release/7.0
Sep 29, 2022
Merged

[release/7.0] [wasm] Templates nits#76373
carlossanlop merged 6 commits into
release/7.0from
backport/pr-76182-to-release/7.0

Conversation

@github-actions

@github-actionsgithub-actionsBot commented Sep 29, 2022

Copy link
Copy Markdown
Contributor

Backport of #76182 to release/7.0

/cc @radical@maraf

Customer Impact

Polish few minor things in template

  • Add template descriptions.
  • Unify string quotes.

Testing

Manual app creation from template

Risk

None

IMPORTANT: Is this backport for a servicing release? If so and this change touches code that ships in a NuGet package, please make certain that you have added any necessary package authoring and gotten it explicitly reviewed.

@ghost

Copy link
Copy Markdown

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

@marafmaraf added this to the 7.0.0 milestone Sep 29, 2022
@marafmaraf added arch-wasm WebAssembly architecture area-Build-mono labels Sep 29, 2022
@ghost

Copy link
Copy Markdown

Tagging subscribers to 'arch-wasm': @lewing
See info in area-owners.md if you want to be subscribed.

Issue Details

Backport of #76182 to release/7.0

/cc @radical@maraf

Customer Impact

Polish few minor things in template

  • Add template descriptions.
  • Unify string quotes.

Testing

Manual app creation from template

Risk

None

IMPORTANT: Is this backport for a servicing release? If so and this change touches code that ships in a NuGet package, please make certain that you have added any necessary package authoring and gotten it explicitly reviewed.

Author:github-actions[bot]
Assignees:-
Labels:

arch-wasm, area-Build-mono

Milestone:7.0.0

@radicalradical added the Servicing-consider Issue for next servicing release review label Sep 29, 2022
radical added a commit that referenced this pull request Sep 29, 2022
- Use latest sdk for testing
- Add dotnet8 feed, needed by blazorwasm templates
- Workaround a bug in 7.0 templates which will be fixed by
#76373 . And this can be removed
once we have packages with that.
@radicalradical added Servicing-approved Approved for servicing release and removed Servicing-consider Issue for next servicing release review labels Sep 29, 2022
@radical

Copy link
Copy Markdown
Member

@carlossanlop approved over email

@carlossanlop

Copy link
Copy Markdown
Contributor

:shipit:

@carlossanlop
carlossanlop merged commit f29fd6f into release/7.0Sep 29, 2022
@carlossanlop
carlossanlop deleted the backport/pr-76182-to-release/7.0 branch September 29, 2022 21:55
lewing pushed a commit that referenced this pull request Oct 3, 2022
* Update dependencies from https://github.com/dotnet/arcade build 20220920.1
Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
From Version 8.0.0-beta.22469.1 -> To Version 8.0.0-beta.22470.1
* Update dependencies from https://github.com/dotnet/arcade build 20220920.3
Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
From Version 8.0.0-beta.22469.1 -> To Version 8.0.0-beta.22470.3
* Update dependencies from https://github.com/dotnet/arcade build 20220921.2
Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
From Version 8.0.0-beta.22469.1 -> To Version 8.0.0-beta.22471.2
* Update dependencies from https://github.com/dotnet/arcade build 20220922.1
Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
From Version 8.0.0-beta.22469.1 -> To Version 8.0.0-beta.22472.1
* Update dependencies from https://github.com/dotnet/arcade build 20220923.1
Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
From Version 8.0.0-beta.22469.1 -> To Version 8.0.0-beta.22473.1
* Update dependencies from https://github.com/dotnet/arcade build 20220926.4
Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
From Version 8.0.0-beta.22469.1 -> To Version 8.0.0-beta.22476.4
* Update dependencies from https://github.com/dotnet/arcade build 20220927.1
Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
From Version 8.0.0-beta.22469.1 -> To Version 8.0.0-beta.22477.1
* InstallWorkloadFromArtifacts: Remove hack because we have an updated sdk now
* [wasm] WBT: Make project names unique
* [wasm] WBT: Use a clean NUGET_PACKAGES dir separate from the project directory
* [wasm] WBT: Fixes to work with latest sdk
- Use only one source of which tfm to use
- Allow a different tfm for blazor
- Add `dotnet8` nuget feed for tests
- Support more than one choice for nuget.config, like for net7, or net8
* Revert to test projects created in bindir, instead of a temp one
This was necessary because on windows the tmp path is very long, causing
the test project paths to become too long causing build failures.
* [wasm] fix weird build failures
`MSBuildSDKsPath` is set by runtime repo, and that interferes with the
test projects. To avoid this the `MSBuildSDKsPath` was set to `""` in
the test environment. But even that can negatively affect the build
because msbuild treats environment variables as "global properties" that
cannot be changed. This manifests when running:
`$ dotnet run --no-build`
.. it would fail with `/foo/bar.csproj is not a valid project file`.
Instead, explicitly *remove* `MSBuildSDKsPath` from the environment when
invoking the process.
* PInvokeTableGenerator: Find path to WasmAppBuilder.dll at test time
.. instead of depending on *one* runtime pack version. This is needed
when we have more than one workload installed.
* WasmAppHost: allow rollForward to work with newer sdks
* Don't use the nuget packages directory as fallback.
.. because we explicitly set `NUGET_PACKAGES` envvar now.
* [wasm] Use the latest sdk for Wasm.Build.Tests
* Add missing nuget8.config
* WBT: workaround for #76201
* Update dependencies from https://github.com/dotnet/arcade build 20220928.2
Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
From Version 8.0.0-beta.22469.1 -> To Version 8.0.0-beta.22478.2
* Revert "WBT: workaround for #76201"
This reverts commit 33e3679.
* Revert "Add missing nuget8.config"
This reverts commit dec9861.
* Revert "[wasm] Use the latest sdk for Wasm.Build.Tests"
This reverts commit 3a15bdf.
* Revert "Don't use the nuget packages directory as fallback."
This reverts commit 785504e.
* Revert "WasmAppHost: allow rollForward to work with newer sdks"
This reverts commit 28cfbcd.
* Revert "PInvokeTableGenerator: Find path to WasmAppBuilder.dll at test time"
This reverts commit 33dbf98.
* Revert "[wasm] fix weird build failures"
This reverts commit 1a731fb.
* Revert "Revert to test projects created in bindir, instead of a temp one"
This reverts commit 57ff0dd.
* Revert "[wasm] WBT: Fixes to work with latest sdk"
This reverts commit 0aa1b5a.
* Revert "[wasm] WBT: Use a clean NUGET_PACKAGES dir separate from the project directory"
This reverts commit 0678940.
* Revert "[wasm] WBT: Make project names unique"
This reverts commit 55120ac.
* Revert "InstallWorkloadFromArtifacts: Remove hack because we have an updated sdk now"
This reverts commit 60e9f8c.
* Fix Wasm.Build.Tests failures
- Use latest sdk for testing
- Add dotnet8 feed, needed by blazorwasm templates
- Workaround a bug in 7.0 templates which will be fixed by
#76373 . And this can be removed
once we have packages with that.
* WasmAppHost: Set rollForward=latestMajor to work with newer sdks
* Update dependencies from https://github.com/dotnet/arcade build 20220929.2
Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
From Version 8.0.0-beta.22469.1 -> To Version 8.0.0-beta.22479.2
* Update dependencies from https://github.com/dotnet/arcade build 20220930.2
Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
From Version 8.0.0-beta.22469.1 -> To Version 8.0.0-beta.22480.2
* Revert changes to source-build.yml
It was missing dotnet/arcade#10782
* Update dependencies from https://github.com/dotnet/arcade build 20220930.2
Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
From Version 8.0.0-beta.22469.1 -> To Version 8.0.0-beta.22480.2
* Revert changes again
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Ankit Jain <radical@gmail.com>
Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
@ghostghost locked as resolved and limited conversation to collaborators Oct 30, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

arch-wasmWebAssembly architecturearea-Build-monoServicing-approvedApproved for servicing release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@radical@carlossanlop@lewing@pavelsavara@maraf