diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b41ecd2482..68b40a1e16 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -10,43 +10,47 @@ /tests/dotnet-msbuild/ @ViktorHofer @JanKrivanek /agentic-workflows/dotnet-msbuild/ @ViktorHofer @JanKrivanek -/plugins/dotnet/skills/analyzing-dotnet-performance/ @dotnet/dotnet-diag -/tests/dotnet/analyzing-dotnet-performance/ @dotnet/dotnet-diag - +# dotnet (common everyday C#/.NET) /plugins/dotnet/skills/csharp-scripts/ @dotnet/roslyn /tests/dotnet/csharp-scripts/ @dotnet/roslyn /plugins/dotnet/skills/dotnet-pinvoke/ @dotnet/appmodel /tests/dotnet/dotnet-pinvoke/ @dotnet/appmodel -/plugins/dotnet/skills/dump-collect/ @dotnet/dotnet-diag -/tests/dotnet/dump-collect/ @dotnet/dotnet-diag +/plugins/dotnet/skills/nuget-trusted-publishing/ @lewing @kartheekp-ms +/tests/dotnet/nuget-trusted-publishing/ @lewing @kartheekp-ms + +# dotnet-upgrade (migrating and upgrading .NET projects) +/plugins/dotnet-upgrade/skills/thread-abort-migration/ @dotnet/appmodel +/tests/dotnet-upgrade/thread-abort-migration/ @dotnet/appmodel -/plugins/dotnet/skills/dotnet-trace-collect/ @brianrob -/tests/dotnet/dotnet-trace-collect/ @brianrob +/plugins/dotnet-upgrade/skills/migrate-nullable-references/ @danmoseley +/tests/dotnet-upgrade/migrate-nullable-references/ @danmoseley -/plugins/dotnet/skills/optimizing-ef-core-queries/ @dotnet/efteam -/tests/dotnet/optimizing-ef-core-queries/ @dotnet/efteam +/plugins/dotnet-upgrade/skills/dotnet-aot-compat/ @agocke @dotnet/appmodel +/tests/dotnet-upgrade/dotnet-aot-compat/ @agocke @dotnet/appmodel -/plugins/dotnet/skills/thread-abort-migration/ @dotnet/appmodel -/tests/dotnet/thread-abort-migration/ @dotnet/appmodel +# dotnet-diag (perf investigations, debugging, incident analysis) +/plugins/dotnet-diag/skills/analyzing-dotnet-performance/ @dotnet/dotnet-diag +/tests/dotnet-diag/analyzing-dotnet-performance/ @dotnet/dotnet-diag -/plugins/dotnet/skills/migrate-nullable-references/ @danmoseley -/tests/dotnet/migrate-nullable-references/ @danmoseley +/plugins/dotnet-diag/skills/dump-collect/ @dotnet/dotnet-diag +/tests/dotnet-diag/dump-collect/ @dotnet/dotnet-diag -/plugins/dotnet/skills/android-tombstone-symbolication/ @dotnet/dotnet-diag -/tests/dotnet/android-tombstone-symbolication/ @dotnet/dotnet-diag +/plugins/dotnet-diag/skills/dotnet-trace-collect/ @brianrob +/tests/dotnet-diag/dotnet-trace-collect/ @brianrob -/plugins/dotnet/skills/clr-activation-debugging/ @marklio @ChrisAhna -/tests/dotnet/clr-activation-debugging/ @marklio @ChrisAhna +/plugins/dotnet-diag/skills/android-tombstone-symbolication/ @dotnet/dotnet-diag +/tests/dotnet-diag/android-tombstone-symbolication/ @dotnet/dotnet-diag -/plugins/dotnet/skills/microbenchmarking/ @dotnet/dotnet-perf-team -/tests/dotnet/microbenchmarking/ @dotnet/dotnet-perf-team +/plugins/dotnet-diag/skills/clr-activation-debugging/ @marklio @ChrisAhna +/tests/dotnet-diag/clr-activation-debugging/ @marklio @ChrisAhna -/plugins/dotnet/skills/nuget-trusted-publishing/ @lewing @kartheekp-ms -/tests/dotnet/nuget-trusted-publishing/ @lewing @kartheekp-ms +/plugins/dotnet-diag/skills/microbenchmarking/ @dotnet/dotnet-perf-team +/tests/dotnet-diag/microbenchmarking/ @dotnet/dotnet-perf-team -/plugins/dotnet/skills/dotnet-aot-compat/ @agocke @dotnet/appmodel -/tests/dotnet/dotnet-aot-compat/ @agocke @dotnet/appmodel +/plugins/dotnet-diag/agents/optimizing-dotnet-performance.agent.md @dotnet/appmodel -/plugins/dotnet/agents/optimizing-dotnet-performance.agent.md @dotnet/appmodel +# dotnet-data (data access, Entity Framework) +/plugins/dotnet-data/skills/optimizing-ef-core-queries/ @dotnet/efteam +/tests/dotnet-data/optimizing-ef-core-queries/ @dotnet/efteam diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c715577d57..495d43d357 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -43,6 +43,27 @@ agentic-workflows/ Every plugin must have a plugin.json file in the plugin root that is linked to from the marketplace.json file. +### Plugin organization + +Skills are grouped into domain-specific plugins. When proposing a new skill, place it in the plugin that best matches its domain: + +| Plugin | Domain | +|--------|--------| +| `dotnet` | Common everyday C#/.NET coding tasks useful to all .NET developers | +| `dotnet-upgrade` | Migrating and upgrading .NET projects across framework versions, language features, and compatibility targets | +| `dotnet-diag` | Performance investigations, debugging, and incident analysis | +| `dotnet-data` | Data access and Entity Framework | +| `dotnet-msbuild` | MSBuild and project system | + +If your skill does not fit any existing plugin, consider creating a new one. The following plugin names are reserved for future use and are good candidates for new skills in those areas: + +- `dotnet-aspnet` — ASP.NET +- `dotnet-wpf` — WPF +- `dotnet-winforms` — Windows Forms (WinForms) +- `dotnet-maui` — .NET MAUI + +To create a new plugin, add a `plugins//plugin.json` file and a matching entry in the marketplace.json file. See existing plugins for the expected format. + ## Before you start - Search existing issues and pull requests to avoid duplicates. @@ -108,7 +129,7 @@ description: **Tip:** The `description` field is used by the agent runtime to decide whether to load the full skill. > Include **when to use** and **when not to use** guidance directly in the description so the agent can > select or skip skills without reading the entire `SKILL.md`. This avoids unnecessary token usage. -> See [`thread-abort-migration/SKILL.md`](plugins/dotnet/skills/thread-abort-migration/SKILL.md) for a good example. +> See [`thread-abort-migration/SKILL.md`](plugins/dotnet-upgrade/skills/thread-abort-migration/SKILL.md) for a good example. ### Recommended `SKILL.md` sections diff --git a/plugins/dotnet-data/plugin.json b/plugins/dotnet-data/plugin.json new file mode 100644 index 0000000000..72f1deda15 --- /dev/null +++ b/plugins/dotnet-data/plugin.json @@ -0,0 +1,7 @@ +{ + "name": "dotnet-data", + "version": "0.1.0", + "description": "Skills for .NET data access and Entity Framework related tasks.", + "skills": "./skills/", + "agents": "./agents/" +} diff --git a/plugins/dotnet/skills/optimizing-ef-core-queries/SKILL.md b/plugins/dotnet-data/skills/optimizing-ef-core-queries/SKILL.md similarity index 100% rename from plugins/dotnet/skills/optimizing-ef-core-queries/SKILL.md rename to plugins/dotnet-data/skills/optimizing-ef-core-queries/SKILL.md diff --git a/plugins/dotnet/agents/optimizing-dotnet-performance.agent.md b/plugins/dotnet-diag/agents/optimizing-dotnet-performance.agent.md similarity index 100% rename from plugins/dotnet/agents/optimizing-dotnet-performance.agent.md rename to plugins/dotnet-diag/agents/optimizing-dotnet-performance.agent.md diff --git a/plugins/dotnet-diag/plugin.json b/plugins/dotnet-diag/plugin.json new file mode 100644 index 0000000000..e77893ac21 --- /dev/null +++ b/plugins/dotnet-diag/plugin.json @@ -0,0 +1,7 @@ +{ + "name": "dotnet-diag", + "version": "0.1.0", + "description": "Skills for .NET performance investigations, debugging, and incident analysis.", + "skills": "./skills/", + "agents": "./agents/" +} diff --git a/plugins/dotnet/skills/analyzing-dotnet-performance/SKILL.md b/plugins/dotnet-diag/skills/analyzing-dotnet-performance/SKILL.md similarity index 100% rename from plugins/dotnet/skills/analyzing-dotnet-performance/SKILL.md rename to plugins/dotnet-diag/skills/analyzing-dotnet-performance/SKILL.md diff --git a/plugins/dotnet/skills/analyzing-dotnet-performance/references/async-patterns.md b/plugins/dotnet-diag/skills/analyzing-dotnet-performance/references/async-patterns.md similarity index 100% rename from plugins/dotnet/skills/analyzing-dotnet-performance/references/async-patterns.md rename to plugins/dotnet-diag/skills/analyzing-dotnet-performance/references/async-patterns.md diff --git a/plugins/dotnet/skills/analyzing-dotnet-performance/references/collections-and-linq.md b/plugins/dotnet-diag/skills/analyzing-dotnet-performance/references/collections-and-linq.md similarity index 100% rename from plugins/dotnet/skills/analyzing-dotnet-performance/references/collections-and-linq.md rename to plugins/dotnet-diag/skills/analyzing-dotnet-performance/references/collections-and-linq.md diff --git a/plugins/dotnet/skills/analyzing-dotnet-performance/references/critical-patterns.md b/plugins/dotnet-diag/skills/analyzing-dotnet-performance/references/critical-patterns.md similarity index 100% rename from plugins/dotnet/skills/analyzing-dotnet-performance/references/critical-patterns.md rename to plugins/dotnet-diag/skills/analyzing-dotnet-performance/references/critical-patterns.md diff --git a/plugins/dotnet/skills/analyzing-dotnet-performance/references/io-and-serialization.md b/plugins/dotnet-diag/skills/analyzing-dotnet-performance/references/io-and-serialization.md similarity index 100% rename from plugins/dotnet/skills/analyzing-dotnet-performance/references/io-and-serialization.md rename to plugins/dotnet-diag/skills/analyzing-dotnet-performance/references/io-and-serialization.md diff --git a/plugins/dotnet/skills/analyzing-dotnet-performance/references/memory-and-strings.md b/plugins/dotnet-diag/skills/analyzing-dotnet-performance/references/memory-and-strings.md similarity index 100% rename from plugins/dotnet/skills/analyzing-dotnet-performance/references/memory-and-strings.md rename to plugins/dotnet-diag/skills/analyzing-dotnet-performance/references/memory-and-strings.md diff --git a/plugins/dotnet/skills/analyzing-dotnet-performance/references/regex-patterns.md b/plugins/dotnet-diag/skills/analyzing-dotnet-performance/references/regex-patterns.md similarity index 100% rename from plugins/dotnet/skills/analyzing-dotnet-performance/references/regex-patterns.md rename to plugins/dotnet-diag/skills/analyzing-dotnet-performance/references/regex-patterns.md diff --git a/plugins/dotnet/skills/analyzing-dotnet-performance/references/structural-patterns.md b/plugins/dotnet-diag/skills/analyzing-dotnet-performance/references/structural-patterns.md similarity index 100% rename from plugins/dotnet/skills/analyzing-dotnet-performance/references/structural-patterns.md rename to plugins/dotnet-diag/skills/analyzing-dotnet-performance/references/structural-patterns.md diff --git a/plugins/dotnet/skills/android-tombstone-symbolication/SKILL.md b/plugins/dotnet-diag/skills/android-tombstone-symbolication/SKILL.md similarity index 100% rename from plugins/dotnet/skills/android-tombstone-symbolication/SKILL.md rename to plugins/dotnet-diag/skills/android-tombstone-symbolication/SKILL.md diff --git a/plugins/dotnet/skills/android-tombstone-symbolication/scripts/Symbolicate-Tombstone.ps1 b/plugins/dotnet-diag/skills/android-tombstone-symbolication/scripts/Symbolicate-Tombstone.ps1 similarity index 100% rename from plugins/dotnet/skills/android-tombstone-symbolication/scripts/Symbolicate-Tombstone.ps1 rename to plugins/dotnet-diag/skills/android-tombstone-symbolication/scripts/Symbolicate-Tombstone.ps1 diff --git a/plugins/dotnet/skills/clr-activation-debugging/SKILL.md b/plugins/dotnet-diag/skills/clr-activation-debugging/SKILL.md similarity index 100% rename from plugins/dotnet/skills/clr-activation-debugging/SKILL.md rename to plugins/dotnet-diag/skills/clr-activation-debugging/SKILL.md diff --git a/plugins/dotnet/skills/clr-activation-debugging/references/activation-flow.md b/plugins/dotnet-diag/skills/clr-activation-debugging/references/activation-flow.md similarity index 100% rename from plugins/dotnet/skills/clr-activation-debugging/references/activation-flow.md rename to plugins/dotnet-diag/skills/clr-activation-debugging/references/activation-flow.md diff --git a/plugins/dotnet/skills/clr-activation-debugging/references/com-activation.md b/plugins/dotnet-diag/skills/clr-activation-debugging/references/com-activation.md similarity index 100% rename from plugins/dotnet/skills/clr-activation-debugging/references/com-activation.md rename to plugins/dotnet-diag/skills/clr-activation-debugging/references/com-activation.md diff --git a/plugins/dotnet/skills/clr-activation-debugging/references/log-format.md b/plugins/dotnet-diag/skills/clr-activation-debugging/references/log-format.md similarity index 100% rename from plugins/dotnet/skills/clr-activation-debugging/references/log-format.md rename to plugins/dotnet-diag/skills/clr-activation-debugging/references/log-format.md diff --git a/plugins/dotnet/skills/dotnet-trace-collect/SKILL.md b/plugins/dotnet-diag/skills/dotnet-trace-collect/SKILL.md similarity index 100% rename from plugins/dotnet/skills/dotnet-trace-collect/SKILL.md rename to plugins/dotnet-diag/skills/dotnet-trace-collect/SKILL.md diff --git a/plugins/dotnet/skills/dotnet-trace-collect/references/dotnet-monitor.md b/plugins/dotnet-diag/skills/dotnet-trace-collect/references/dotnet-monitor.md similarity index 100% rename from plugins/dotnet/skills/dotnet-trace-collect/references/dotnet-monitor.md rename to plugins/dotnet-diag/skills/dotnet-trace-collect/references/dotnet-monitor.md diff --git a/plugins/dotnet/skills/dotnet-trace-collect/references/dotnet-trace-collect-linux.md b/plugins/dotnet-diag/skills/dotnet-trace-collect/references/dotnet-trace-collect-linux.md similarity index 100% rename from plugins/dotnet/skills/dotnet-trace-collect/references/dotnet-trace-collect-linux.md rename to plugins/dotnet-diag/skills/dotnet-trace-collect/references/dotnet-trace-collect-linux.md diff --git a/plugins/dotnet/skills/dotnet-trace-collect/references/dotnet-trace-collect.md b/plugins/dotnet-diag/skills/dotnet-trace-collect/references/dotnet-trace-collect.md similarity index 100% rename from plugins/dotnet/skills/dotnet-trace-collect/references/dotnet-trace-collect.md rename to plugins/dotnet-diag/skills/dotnet-trace-collect/references/dotnet-trace-collect.md diff --git a/plugins/dotnet/skills/dotnet-trace-collect/references/perfcollect.md b/plugins/dotnet-diag/skills/dotnet-trace-collect/references/perfcollect.md similarity index 100% rename from plugins/dotnet/skills/dotnet-trace-collect/references/perfcollect.md rename to plugins/dotnet-diag/skills/dotnet-trace-collect/references/perfcollect.md diff --git a/plugins/dotnet/skills/dotnet-trace-collect/references/perfview.md b/plugins/dotnet-diag/skills/dotnet-trace-collect/references/perfview.md similarity index 100% rename from plugins/dotnet/skills/dotnet-trace-collect/references/perfview.md rename to plugins/dotnet-diag/skills/dotnet-trace-collect/references/perfview.md diff --git a/plugins/dotnet/skills/dump-collect/SKILL.md b/plugins/dotnet-diag/skills/dump-collect/SKILL.md similarity index 100% rename from plugins/dotnet/skills/dump-collect/SKILL.md rename to plugins/dotnet-diag/skills/dump-collect/SKILL.md diff --git a/plugins/dotnet/skills/dump-collect/references/container-dumps.md b/plugins/dotnet-diag/skills/dump-collect/references/container-dumps.md similarity index 100% rename from plugins/dotnet/skills/dump-collect/references/container-dumps.md rename to plugins/dotnet-diag/skills/dump-collect/references/container-dumps.md diff --git a/plugins/dotnet/skills/dump-collect/references/coreclr-dumps.md b/plugins/dotnet-diag/skills/dump-collect/references/coreclr-dumps.md similarity index 100% rename from plugins/dotnet/skills/dump-collect/references/coreclr-dumps.md rename to plugins/dotnet-diag/skills/dump-collect/references/coreclr-dumps.md diff --git a/plugins/dotnet/skills/dump-collect/references/nativeaot-dumps.md b/plugins/dotnet-diag/skills/dump-collect/references/nativeaot-dumps.md similarity index 100% rename from plugins/dotnet/skills/dump-collect/references/nativeaot-dumps.md rename to plugins/dotnet-diag/skills/dump-collect/references/nativeaot-dumps.md diff --git a/plugins/dotnet/skills/microbenchmarking/SKILL.md b/plugins/dotnet-diag/skills/microbenchmarking/SKILL.md similarity index 100% rename from plugins/dotnet/skills/microbenchmarking/SKILL.md rename to plugins/dotnet-diag/skills/microbenchmarking/SKILL.md diff --git a/plugins/dotnet/skills/microbenchmarking/references/bdn-internals-and-tuning.md b/plugins/dotnet-diag/skills/microbenchmarking/references/bdn-internals-and-tuning.md similarity index 100% rename from plugins/dotnet/skills/microbenchmarking/references/bdn-internals-and-tuning.md rename to plugins/dotnet-diag/skills/microbenchmarking/references/bdn-internals-and-tuning.md diff --git a/plugins/dotnet/skills/microbenchmarking/references/comparison-strategies.md b/plugins/dotnet-diag/skills/microbenchmarking/references/comparison-strategies.md similarity index 100% rename from plugins/dotnet/skills/microbenchmarking/references/comparison-strategies.md rename to plugins/dotnet-diag/skills/microbenchmarking/references/comparison-strategies.md diff --git a/plugins/dotnet/skills/microbenchmarking/references/diagnosers-and-exporters.md b/plugins/dotnet-diag/skills/microbenchmarking/references/diagnosers-and-exporters.md similarity index 100% rename from plugins/dotnet/skills/microbenchmarking/references/diagnosers-and-exporters.md rename to plugins/dotnet-diag/skills/microbenchmarking/references/diagnosers-and-exporters.md diff --git a/plugins/dotnet/skills/microbenchmarking/references/project-setup-and-running.md b/plugins/dotnet-diag/skills/microbenchmarking/references/project-setup-and-running.md similarity index 100% rename from plugins/dotnet/skills/microbenchmarking/references/project-setup-and-running.md rename to plugins/dotnet-diag/skills/microbenchmarking/references/project-setup-and-running.md diff --git a/plugins/dotnet/skills/microbenchmarking/references/writing-benchmarks.md b/plugins/dotnet-diag/skills/microbenchmarking/references/writing-benchmarks.md similarity index 100% rename from plugins/dotnet/skills/microbenchmarking/references/writing-benchmarks.md rename to plugins/dotnet-diag/skills/microbenchmarking/references/writing-benchmarks.md diff --git a/plugins/dotnet-upgrade/plugin.json b/plugins/dotnet-upgrade/plugin.json new file mode 100644 index 0000000000..b5fb930b15 --- /dev/null +++ b/plugins/dotnet-upgrade/plugin.json @@ -0,0 +1,7 @@ +{ + "name": "dotnet-upgrade", + "version": "0.1.0", + "description": "Skills for migrating and upgrading .NET projects across framework versions, language features, and compatibility targets.", + "skills": "./skills/", + "agents": "./agents/" +} diff --git a/plugins/dotnet/skills/dotnet-aot-compat/SKILL.md b/plugins/dotnet-upgrade/skills/dotnet-aot-compat/SKILL.md similarity index 100% rename from plugins/dotnet/skills/dotnet-aot-compat/SKILL.md rename to plugins/dotnet-upgrade/skills/dotnet-aot-compat/SKILL.md diff --git a/plugins/dotnet/skills/dotnet-aot-compat/references/polyfills.md b/plugins/dotnet-upgrade/skills/dotnet-aot-compat/references/polyfills.md similarity index 100% rename from plugins/dotnet/skills/dotnet-aot-compat/references/polyfills.md rename to plugins/dotnet-upgrade/skills/dotnet-aot-compat/references/polyfills.md diff --git a/plugins/dotnet/skills/migrate-nullable-references/SKILL.md b/plugins/dotnet-upgrade/skills/migrate-nullable-references/SKILL.md similarity index 100% rename from plugins/dotnet/skills/migrate-nullable-references/SKILL.md rename to plugins/dotnet-upgrade/skills/migrate-nullable-references/SKILL.md diff --git a/plugins/dotnet/skills/migrate-nullable-references/references/aspnet-core.md b/plugins/dotnet-upgrade/skills/migrate-nullable-references/references/aspnet-core.md similarity index 100% rename from plugins/dotnet/skills/migrate-nullable-references/references/aspnet-core.md rename to plugins/dotnet-upgrade/skills/migrate-nullable-references/references/aspnet-core.md diff --git a/plugins/dotnet/skills/migrate-nullable-references/references/breaking-changes.md b/plugins/dotnet-upgrade/skills/migrate-nullable-references/references/breaking-changes.md similarity index 100% rename from plugins/dotnet/skills/migrate-nullable-references/references/breaking-changes.md rename to plugins/dotnet-upgrade/skills/migrate-nullable-references/references/breaking-changes.md diff --git a/plugins/dotnet/skills/migrate-nullable-references/references/ef-core.md b/plugins/dotnet-upgrade/skills/migrate-nullable-references/references/ef-core.md similarity index 100% rename from plugins/dotnet/skills/migrate-nullable-references/references/ef-core.md rename to plugins/dotnet-upgrade/skills/migrate-nullable-references/references/ef-core.md diff --git a/plugins/dotnet/skills/migrate-nullable-references/references/nullable-attributes.md b/plugins/dotnet-upgrade/skills/migrate-nullable-references/references/nullable-attributes.md similarity index 100% rename from plugins/dotnet/skills/migrate-nullable-references/references/nullable-attributes.md rename to plugins/dotnet-upgrade/skills/migrate-nullable-references/references/nullable-attributes.md diff --git a/plugins/dotnet/skills/migrate-nullable-references/scripts/Get-NullableReadiness.ps1 b/plugins/dotnet-upgrade/skills/migrate-nullable-references/scripts/Get-NullableReadiness.ps1 similarity index 100% rename from plugins/dotnet/skills/migrate-nullable-references/scripts/Get-NullableReadiness.ps1 rename to plugins/dotnet-upgrade/skills/migrate-nullable-references/scripts/Get-NullableReadiness.ps1 diff --git a/plugins/dotnet/skills/thread-abort-migration/SKILL.md b/plugins/dotnet-upgrade/skills/thread-abort-migration/SKILL.md similarity index 100% rename from plugins/dotnet/skills/thread-abort-migration/SKILL.md rename to plugins/dotnet-upgrade/skills/thread-abort-migration/SKILL.md diff --git a/plugins/dotnet/plugin.json b/plugins/dotnet/plugin.json index 314055c916..696c85fa46 100644 --- a/plugins/dotnet/plugin.json +++ b/plugins/dotnet/plugin.json @@ -1,7 +1,7 @@ { "name": "dotnet", "version": "0.1.0", - "description": "Collection of core .NET skills for handling common .NET coding tasks.", + "description": "Common everyday C#/.NET coding skills. Expected to be useful to all .NET developers.", "skills": "./skills/", "agents": "./agents/" } diff --git a/tests/dotnet/optimizing-ef-core-queries/eval.yaml b/tests/dotnet-data/optimizing-ef-core-queries/eval.yaml similarity index 100% rename from tests/dotnet/optimizing-ef-core-queries/eval.yaml rename to tests/dotnet-data/optimizing-ef-core-queries/eval.yaml diff --git a/tests/dotnet/analyzing-dotnet-performance/eval.yaml b/tests/dotnet-diag/analyzing-dotnet-performance/eval.yaml similarity index 100% rename from tests/dotnet/analyzing-dotnet-performance/eval.yaml rename to tests/dotnet-diag/analyzing-dotnet-performance/eval.yaml diff --git a/tests/dotnet/analyzing-dotnet-performance/fixtures/byte-size-formatting.cs b/tests/dotnet-diag/analyzing-dotnet-performance/fixtures/byte-size-formatting.cs similarity index 100% rename from tests/dotnet/analyzing-dotnet-performance/fixtures/byte-size-formatting.cs rename to tests/dotnet-diag/analyzing-dotnet-performance/fixtures/byte-size-formatting.cs diff --git a/tests/dotnet/analyzing-dotnet-performance/fixtures/inflector-and-regex.cs b/tests/dotnet-diag/analyzing-dotnet-performance/fixtures/inflector-and-regex.cs similarity index 100% rename from tests/dotnet/analyzing-dotnet-performance/fixtures/inflector-and-regex.cs rename to tests/dotnet-diag/analyzing-dotnet-performance/fixtures/inflector-and-regex.cs diff --git a/tests/dotnet/analyzing-dotnet-performance/fixtures/metric-numeral-extensions.cs b/tests/dotnet-diag/analyzing-dotnet-performance/fixtures/metric-numeral-extensions.cs similarity index 100% rename from tests/dotnet/analyzing-dotnet-performance/fixtures/metric-numeral-extensions.cs rename to tests/dotnet-diag/analyzing-dotnet-performance/fixtures/metric-numeral-extensions.cs diff --git a/tests/dotnet/analyzing-dotnet-performance/fixtures/number-converter-farsi-kurdish.cs b/tests/dotnet-diag/analyzing-dotnet-performance/fixtures/number-converter-farsi-kurdish.cs similarity index 100% rename from tests/dotnet/analyzing-dotnet-performance/fixtures/number-converter-farsi-kurdish.cs rename to tests/dotnet-diag/analyzing-dotnet-performance/fixtures/number-converter-farsi-kurdish.cs diff --git a/tests/dotnet/analyzing-dotnet-performance/fixtures/number-converter-greek.cs b/tests/dotnet-diag/analyzing-dotnet-performance/fixtures/number-converter-greek.cs similarity index 100% rename from tests/dotnet/analyzing-dotnet-performance/fixtures/number-converter-greek.cs rename to tests/dotnet-diag/analyzing-dotnet-performance/fixtures/number-converter-greek.cs diff --git a/tests/dotnet/analyzing-dotnet-performance/fixtures/number-converter-multi-locale.cs b/tests/dotnet-diag/analyzing-dotnet-performance/fixtures/number-converter-multi-locale.cs similarity index 100% rename from tests/dotnet/analyzing-dotnet-performance/fixtures/number-converter-multi-locale.cs rename to tests/dotnet-diag/analyzing-dotnet-performance/fixtures/number-converter-multi-locale.cs diff --git a/tests/dotnet/analyzing-dotnet-performance/fixtures/string-humanize-and-dehumanize.cs b/tests/dotnet-diag/analyzing-dotnet-performance/fixtures/string-humanize-and-dehumanize.cs similarity index 100% rename from tests/dotnet/analyzing-dotnet-performance/fixtures/string-humanize-and-dehumanize.cs rename to tests/dotnet-diag/analyzing-dotnet-performance/fixtures/string-humanize-and-dehumanize.cs diff --git a/tests/dotnet/analyzing-dotnet-performance/fixtures/timespan-and-collection-formatters.cs b/tests/dotnet-diag/analyzing-dotnet-performance/fixtures/timespan-and-collection-formatters.cs similarity index 100% rename from tests/dotnet/analyzing-dotnet-performance/fixtures/timespan-and-collection-formatters.cs rename to tests/dotnet-diag/analyzing-dotnet-performance/fixtures/timespan-and-collection-formatters.cs diff --git a/tests/dotnet/analyzing-dotnet-performance/fixtures/truncation-and-span.cs b/tests/dotnet-diag/analyzing-dotnet-performance/fixtures/truncation-and-span.cs similarity index 100% rename from tests/dotnet/analyzing-dotnet-performance/fixtures/truncation-and-span.cs rename to tests/dotnet-diag/analyzing-dotnet-performance/fixtures/truncation-and-span.cs diff --git a/tests/dotnet/analyzing-dotnet-performance/fixtures/unsealed-classes.cs b/tests/dotnet-diag/analyzing-dotnet-performance/fixtures/unsealed-classes.cs similarity index 100% rename from tests/dotnet/analyzing-dotnet-performance/fixtures/unsealed-classes.cs rename to tests/dotnet-diag/analyzing-dotnet-performance/fixtures/unsealed-classes.cs diff --git a/tests/dotnet/analyzing-dotnet-performance/fixtures/vocabulary-and-inflections.cs b/tests/dotnet-diag/analyzing-dotnet-performance/fixtures/vocabulary-and-inflections.cs similarity index 100% rename from tests/dotnet/analyzing-dotnet-performance/fixtures/vocabulary-and-inflections.cs rename to tests/dotnet-diag/analyzing-dotnet-performance/fixtures/vocabulary-and-inflections.cs diff --git a/tests/dotnet/android-tombstone-symbolication/crashlog_ios.txt b/tests/dotnet-diag/android-tombstone-symbolication/crashlog_ios.txt similarity index 100% rename from tests/dotnet/android-tombstone-symbolication/crashlog_ios.txt rename to tests/dotnet-diag/android-tombstone-symbolication/crashlog_ios.txt diff --git a/tests/dotnet/android-tombstone-symbolication/eval.yaml b/tests/dotnet-diag/android-tombstone-symbolication/eval.yaml similarity index 100% rename from tests/dotnet/android-tombstone-symbolication/eval.yaml rename to tests/dotnet-diag/android-tombstone-symbolication/eval.yaml diff --git a/tests/dotnet/android-tombstone-symbolication/tombstone_coreclr.txt b/tests/dotnet-diag/android-tombstone-symbolication/tombstone_coreclr.txt similarity index 100% rename from tests/dotnet/android-tombstone-symbolication/tombstone_coreclr.txt rename to tests/dotnet-diag/android-tombstone-symbolication/tombstone_coreclr.txt diff --git a/tests/dotnet/android-tombstone-symbolication/tombstone_multi_buildid.txt b/tests/dotnet-diag/android-tombstone-symbolication/tombstone_multi_buildid.txt similarity index 100% rename from tests/dotnet/android-tombstone-symbolication/tombstone_multi_buildid.txt rename to tests/dotnet-diag/android-tombstone-symbolication/tombstone_multi_buildid.txt diff --git a/tests/dotnet/android-tombstone-symbolication/tombstone_multithread.txt b/tests/dotnet-diag/android-tombstone-symbolication/tombstone_multithread.txt similarity index 100% rename from tests/dotnet/android-tombstone-symbolication/tombstone_multithread.txt rename to tests/dotnet-diag/android-tombstone-symbolication/tombstone_multithread.txt diff --git a/tests/dotnet/android-tombstone-symbolication/tombstone_nativeaot.txt b/tests/dotnet-diag/android-tombstone-symbolication/tombstone_nativeaot.txt similarity index 100% rename from tests/dotnet/android-tombstone-symbolication/tombstone_nativeaot.txt rename to tests/dotnet-diag/android-tombstone-symbolication/tombstone_nativeaot.txt diff --git a/tests/dotnet/android-tombstone-symbolication/tombstone_no_buildid.txt b/tests/dotnet-diag/android-tombstone-symbolication/tombstone_no_buildid.txt similarity index 100% rename from tests/dotnet/android-tombstone-symbolication/tombstone_no_buildid.txt rename to tests/dotnet-diag/android-tombstone-symbolication/tombstone_no_buildid.txt diff --git a/tests/dotnet/android-tombstone-symbolication/tombstone_no_dotnet.txt b/tests/dotnet-diag/android-tombstone-symbolication/tombstone_no_dotnet.txt similarity index 100% rename from tests/dotnet/android-tombstone-symbolication/tombstone_no_dotnet.txt rename to tests/dotnet-diag/android-tombstone-symbolication/tombstone_no_dotnet.txt diff --git a/tests/dotnet/android-tombstone-symbolication/tombstone_sample.txt b/tests/dotnet-diag/android-tombstone-symbolication/tombstone_sample.txt similarity index 100% rename from tests/dotnet/android-tombstone-symbolication/tombstone_sample.txt rename to tests/dotnet-diag/android-tombstone-symbolication/tombstone_sample.txt diff --git a/tests/dotnet/clr-activation-debugging/eval.yaml b/tests/dotnet-diag/clr-activation-debugging/eval.yaml similarity index 100% rename from tests/dotnet/clr-activation-debugging/eval.yaml rename to tests/dotnet-diag/clr-activation-debugging/eval.yaml diff --git a/tests/dotnet/clr-activation-debugging/fixtures/csc-healthy.txt b/tests/dotnet-diag/clr-activation-debugging/fixtures/csc-healthy.txt similarity index 100% rename from tests/dotnet/clr-activation-debugging/fixtures/csc-healthy.txt rename to tests/dotnet-diag/clr-activation-debugging/fixtures/csc-healthy.txt diff --git a/tests/dotnet/clr-activation-debugging/fixtures/link-fod-suppressed.txt b/tests/dotnet-diag/clr-activation-debugging/fixtures/link-fod-suppressed.txt similarity index 100% rename from tests/dotnet/clr-activation-debugging/fixtures/link-fod-suppressed.txt rename to tests/dotnet-diag/clr-activation-debugging/fixtures/link-fod-suppressed.txt diff --git a/tests/dotnet/clr-activation-debugging/fixtures/link-multi-activation.txt b/tests/dotnet-diag/clr-activation-debugging/fixtures/link-multi-activation.txt similarity index 100% rename from tests/dotnet/clr-activation-debugging/fixtures/link-multi-activation.txt rename to tests/dotnet-diag/clr-activation-debugging/fixtures/link-multi-activation.txt diff --git a/tests/dotnet/clr-activation-debugging/fixtures/mt-fod-launched.txt b/tests/dotnet-diag/clr-activation-debugging/fixtures/mt-fod-launched.txt similarity index 100% rename from tests/dotnet/clr-activation-debugging/fixtures/mt-fod-launched.txt rename to tests/dotnet-diag/clr-activation-debugging/fixtures/mt-fod-launched.txt diff --git a/tests/dotnet/clr-activation-debugging/fixtures/mt-fod-suppressed.txt b/tests/dotnet-diag/clr-activation-debugging/fixtures/mt-fod-suppressed.txt similarity index 100% rename from tests/dotnet/clr-activation-debugging/fixtures/mt-fod-suppressed.txt rename to tests/dotnet-diag/clr-activation-debugging/fixtures/mt-fod-suppressed.txt diff --git a/tests/dotnet/clr-activation-debugging/fixtures/tool-with-legacy-policy.txt b/tests/dotnet-diag/clr-activation-debugging/fixtures/tool-with-legacy-policy.txt similarity index 100% rename from tests/dotnet/clr-activation-debugging/fixtures/tool-with-legacy-policy.txt rename to tests/dotnet-diag/clr-activation-debugging/fixtures/tool-with-legacy-policy.txt diff --git a/tests/dotnet/dotnet-trace-collect/eval.yaml b/tests/dotnet-diag/dotnet-trace-collect/eval.yaml similarity index 100% rename from tests/dotnet/dotnet-trace-collect/eval.yaml rename to tests/dotnet-diag/dotnet-trace-collect/eval.yaml diff --git a/tests/dotnet/dump-collect/eval.yaml b/tests/dotnet-diag/dump-collect/eval.yaml similarity index 100% rename from tests/dotnet/dump-collect/eval.yaml rename to tests/dotnet-diag/dump-collect/eval.yaml diff --git a/tests/dotnet/microbenchmarking/TextAnalyzer/TextAnalyzer.cs b/tests/dotnet-diag/microbenchmarking/TextAnalyzer/TextAnalyzer.cs similarity index 100% rename from tests/dotnet/microbenchmarking/TextAnalyzer/TextAnalyzer.cs rename to tests/dotnet-diag/microbenchmarking/TextAnalyzer/TextAnalyzer.cs diff --git a/tests/dotnet/microbenchmarking/TextAnalyzer/TextAnalyzer.csproj b/tests/dotnet-diag/microbenchmarking/TextAnalyzer/TextAnalyzer.csproj similarity index 100% rename from tests/dotnet/microbenchmarking/TextAnalyzer/TextAnalyzer.csproj rename to tests/dotnet-diag/microbenchmarking/TextAnalyzer/TextAnalyzer.csproj diff --git a/tests/dotnet/microbenchmarking/eval.yaml b/tests/dotnet-diag/microbenchmarking/eval.yaml similarity index 100% rename from tests/dotnet/microbenchmarking/eval.yaml rename to tests/dotnet-diag/microbenchmarking/eval.yaml diff --git a/tests/dotnet/dotnet-aot-compat/after/.gitignore b/tests/dotnet-upgrade/dotnet-aot-compat/after/.gitignore similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/.gitignore rename to tests/dotnet-upgrade/dotnet-aot-compat/after/.gitignore diff --git a/tests/dotnet/dotnet-aot-compat/after/ArmClient.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ArmClient.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ArmClient.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ArmClient.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ArmClientOptions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ArmClientOptions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ArmClientOptions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ArmClientOptions.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ArmCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ArmCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ArmCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ArmCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ArmEnvironment.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ArmEnvironment.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ArmEnvironment.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ArmEnvironment.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ArmOperation.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ArmOperation.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ArmOperation.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ArmOperation.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ArmOperationOfT.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ArmOperationOfT.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ArmOperationOfT.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ArmOperationOfT.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ArmResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ArmResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ArmResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ArmResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Assets/Profile/2020-09-01-hybrid.json b/tests/dotnet-upgrade/dotnet-aot-compat/after/Assets/Profile/2020-09-01-hybrid.json similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Assets/Profile/2020-09-01-hybrid.json rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Assets/Profile/2020-09-01-hybrid.json diff --git a/tests/dotnet/dotnet-aot-compat/after/Azure.ResourceManager.csproj b/tests/dotnet-upgrade/dotnet-aot-compat/after/Azure.ResourceManager.csproj similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Azure.ResourceManager.csproj rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Azure.ResourceManager.csproj diff --git a/tests/dotnet/dotnet-aot-compat/after/AzureStackProfile.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/AzureStackProfile.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/AzureStackProfile.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/AzureStackProfile.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/BicepModelReaderWriterOptions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/BicepModelReaderWriterOptions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/BicepModelReaderWriterOptions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/BicepModelReaderWriterOptions.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/CodeGenAttributes.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/CodeGenAttributes.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/CodeGenAttributes.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/CodeGenAttributes.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Custom/Models/ArmPlan.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Custom/Models/ArmPlan.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Custom/Models/ArmPlan.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Custom/Models/ArmPlan.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Custom/Models/ArmSku.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Custom/Models/ArmSku.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Custom/Models/ArmSku.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Custom/Models/ArmSku.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Custom/Models/EncryptionProperties.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Custom/Models/EncryptionProperties.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Custom/Models/EncryptionProperties.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Custom/Models/EncryptionProperties.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Custom/Models/EncryptionStatus.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Custom/Models/EncryptionStatus.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Custom/Models/EncryptionStatus.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Custom/Models/EncryptionStatus.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Custom/Models/KeyVaultProperties.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Custom/Models/KeyVaultProperties.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Custom/Models/KeyVaultProperties.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Custom/Models/KeyVaultProperties.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Custom/Models/ManagedServiceIdentity.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Custom/Models/ManagedServiceIdentity.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Custom/Models/ManagedServiceIdentity.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Custom/Models/ManagedServiceIdentity.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Custom/Models/ManagedServiceIdentity.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Custom/Models/ManagedServiceIdentity.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Custom/Models/ManagedServiceIdentity.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Custom/Models/ManagedServiceIdentity.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Custom/Models/ManagedServiceIdentityType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Custom/Models/ManagedServiceIdentityType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Custom/Models/ManagedServiceIdentityType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Custom/Models/ManagedServiceIdentityType.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Custom/Models/SystemAssignedServiceIdentity.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Custom/Models/SystemAssignedServiceIdentity.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Custom/Models/SystemAssignedServiceIdentity.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Custom/Models/SystemAssignedServiceIdentity.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Custom/Models/SystemAssignedServiceIdentityType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Custom/Models/SystemAssignedServiceIdentityType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Custom/Models/SystemAssignedServiceIdentityType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Custom/Models/SystemAssignedServiceIdentityType.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Custom/ResourceManagerModelFactory.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Custom/ResourceManagerModelFactory.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Custom/ResourceManagerModelFactory.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Custom/ResourceManagerModelFactory.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Internal/Argument.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Internal/Argument.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Internal/Argument.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Internal/Argument.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Internal/BicepSerializationHelpers.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Internal/BicepSerializationHelpers.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Internal/BicepSerializationHelpers.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Internal/BicepSerializationHelpers.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Internal/ChangeTrackingDictionary.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Internal/ChangeTrackingDictionary.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Internal/ChangeTrackingDictionary.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Internal/ChangeTrackingDictionary.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Internal/ChangeTrackingList.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Internal/ChangeTrackingList.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Internal/ChangeTrackingList.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Internal/ChangeTrackingList.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Internal/ModelSerializationExtensions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Internal/ModelSerializationExtensions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Internal/ModelSerializationExtensions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Internal/ModelSerializationExtensions.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Internal/Optional.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Internal/Optional.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Internal/Optional.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Internal/Optional.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Internal/WirePathAttribute.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Internal/WirePathAttribute.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Internal/WirePathAttribute.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Internal/WirePathAttribute.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/ArmPlan.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/ArmPlan.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/ArmPlan.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/ArmPlan.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/ArmPlan.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/ArmPlan.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/ArmPlan.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/ArmPlan.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/ArmSku.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/ArmSku.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/ArmSku.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/ArmSku.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/ArmSku.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/ArmSku.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/ArmSku.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/ArmSku.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/ArmSkuTier.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/ArmSkuTier.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/ArmSkuTier.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/ArmSkuTier.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/ArmSkuTier.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/ArmSkuTier.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/ArmSkuTier.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/ArmSkuTier.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/AzureResourceManagerContext.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/AzureResourceManagerContext.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/AzureResourceManagerContext.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/AzureResourceManagerContext.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/CreatedByType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/CreatedByType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/CreatedByType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/CreatedByType.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/EncryptionProperties.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/EncryptionProperties.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/EncryptionProperties.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/EncryptionProperties.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/EncryptionProperties.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/EncryptionProperties.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/EncryptionProperties.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/EncryptionProperties.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/EncryptionStatus.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/EncryptionStatus.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/EncryptionStatus.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/EncryptionStatus.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/KeyVaultProperties.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/KeyVaultProperties.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/KeyVaultProperties.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/KeyVaultProperties.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/KeyVaultProperties.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/KeyVaultProperties.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/KeyVaultProperties.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/KeyVaultProperties.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/ManagedServiceIdentityType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/ManagedServiceIdentityType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/ManagedServiceIdentityType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/ManagedServiceIdentityType.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/OperationStatusResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/OperationStatusResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/OperationStatusResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/OperationStatusResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/OperationStatusResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/OperationStatusResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/OperationStatusResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/OperationStatusResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/ResourceData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/ResourceData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/ResourceData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/ResourceData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/ResourceData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/ResourceData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/ResourceData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/ResourceData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/SystemAssignedServiceIdentity.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/SystemAssignedServiceIdentity.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/SystemAssignedServiceIdentity.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/SystemAssignedServiceIdentity.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/SystemAssignedServiceIdentity.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/SystemAssignedServiceIdentity.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/SystemAssignedServiceIdentity.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/SystemAssignedServiceIdentity.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/SystemAssignedServiceIdentityType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/SystemAssignedServiceIdentityType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/SystemAssignedServiceIdentityType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/SystemAssignedServiceIdentityType.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/SystemData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/SystemData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/SystemData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/SystemData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/SystemData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/SystemData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/SystemData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/SystemData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/TrackedResourceData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/TrackedResourceData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/TrackedResourceData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/TrackedResourceData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/TrackedResourceData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/TrackedResourceData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/TrackedResourceData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/TrackedResourceData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/UserAssignedIdentity.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/UserAssignedIdentity.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/UserAssignedIdentity.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/UserAssignedIdentity.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/UserAssignedIdentity.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/UserAssignedIdentity.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Common/Generated/Models/UserAssignedIdentity.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Common/Generated/Models/UserAssignedIdentity.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Directory.Build.props b/tests/dotnet-upgrade/dotnet-aot-compat/after/Directory.Build.props similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Directory.Build.props rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Directory.Build.props diff --git a/tests/dotnet/dotnet-aot-compat/after/Directory.Packages.props b/tests/dotnet-upgrade/dotnet-aot-compat/after/Directory.Packages.props similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Directory.Packages.props rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Directory.Packages.props diff --git a/tests/dotnet/dotnet-aot-compat/after/ExperimentalAttribute.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ExperimentalAttribute.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ExperimentalAttribute.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ExperimentalAttribute.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Extensions/ArmClientBuilderExtensions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Extensions/ArmClientBuilderExtensions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Extensions/ArmClientBuilderExtensions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Extensions/ArmClientBuilderExtensions.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/GenericOperationSource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/GenericOperationSource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/GenericOperationSource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/GenericOperationSource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Custom/HelperSuppressions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Custom/HelperSuppressions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Custom/HelperSuppressions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Custom/HelperSuppressions.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Custom/ManagementGroupResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Custom/ManagementGroupResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Custom/ManagementGroupResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Custom/ManagementGroupResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Custom/Models/ManagementGroupNameAvailabilityContent.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Custom/Models/ManagementGroupNameAvailabilityContent.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Custom/Models/ManagementGroupNameAvailabilityContent.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Custom/Models/ManagementGroupNameAvailabilityContent.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Extensions/ArmClient.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Extensions/ArmClient.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Extensions/ArmClient.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Extensions/ArmClient.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Extensions/TenantResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Extensions/TenantResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Extensions/TenantResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Extensions/TenantResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Internal/WirePathAttribute.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Internal/WirePathAttribute.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Internal/WirePathAttribute.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Internal/WirePathAttribute.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/LongRunningOperation/ManagementGroupOperationSource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/LongRunningOperation/ManagementGroupOperationSource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/LongRunningOperation/ManagementGroupOperationSource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/LongRunningOperation/ManagementGroupOperationSource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/LongRunningOperation/ManagementGroupsArmOperation.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/LongRunningOperation/ManagementGroupsArmOperation.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/LongRunningOperation/ManagementGroupsArmOperation.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/LongRunningOperation/ManagementGroupsArmOperation.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/LongRunningOperation/ManagementGroupsArmOperationOfT.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/LongRunningOperation/ManagementGroupsArmOperationOfT.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/LongRunningOperation/ManagementGroupsArmOperationOfT.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/LongRunningOperation/ManagementGroupsArmOperationOfT.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupSubscriptionCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupSubscriptionCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupSubscriptionCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupSubscriptionCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupSubscriptionData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupSubscriptionData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupSubscriptionData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupSubscriptionData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupSubscriptionData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupSubscriptionData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupSubscriptionData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupSubscriptionData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupSubscriptionResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupSubscriptionResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupSubscriptionResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupSubscriptionResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupSubscriptionResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupSubscriptionResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupSubscriptionResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/ManagementGroupSubscriptionResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/CreateManagementGroupDetails.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/CreateManagementGroupDetails.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/CreateManagementGroupDetails.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/CreateManagementGroupDetails.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/CreateManagementGroupDetails.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/CreateManagementGroupDetails.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/CreateManagementGroupDetails.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/CreateManagementGroupDetails.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantParentGroupInfo.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantParentGroupInfo.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantParentGroupInfo.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantParentGroupInfo.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantParentGroupInfo.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantParentGroupInfo.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantParentGroupInfo.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/DescendantParentGroupInfo.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityPermission.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityPermission.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityPermission.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityPermission.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityPermission.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityPermission.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityPermission.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityPermission.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntitySearchOption.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntitySearchOption.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntitySearchOption.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntitySearchOption.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityViewOption.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityViewOption.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityViewOption.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/EntityViewOption.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ListSubscriptionUnderManagementGroup.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ListSubscriptionUnderManagementGroup.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ListSubscriptionUnderManagementGroup.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ListSubscriptionUnderManagementGroup.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ListSubscriptionUnderManagementGroup.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ListSubscriptionUnderManagementGroup.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ListSubscriptionUnderManagementGroup.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ListSubscriptionUnderManagementGroup.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupChildInfo.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupChildInfo.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupChildInfo.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupChildInfo.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupChildInfo.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupChildInfo.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupChildInfo.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupChildInfo.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupChildOptions.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupChildOptions.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupChildOptions.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupChildOptions.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupChildOptions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupChildOptions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupChildOptions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupChildOptions.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupChildType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupChildType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupChildType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupChildType.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupCollectionGetEntitiesOptions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupCollectionGetEntitiesOptions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupCollectionGetEntitiesOptions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupCollectionGetEntitiesOptions.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupCreateOrUpdateContent.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupCreateOrUpdateContent.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupCreateOrUpdateContent.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupCreateOrUpdateContent.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupCreateOrUpdateContent.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupCreateOrUpdateContent.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupCreateOrUpdateContent.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupCreateOrUpdateContent.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupExpandType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupExpandType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupExpandType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupExpandType.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupInfo.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupInfo.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupInfo.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupInfo.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupInfo.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupInfo.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupInfo.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupInfo.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityContent.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityContent.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityContent.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityContent.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityContent.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityContent.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityContent.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityContent.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameUnavailableReason.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameUnavailableReason.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameUnavailableReason.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameUnavailableReason.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameUnavailableReason.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameUnavailableReason.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameUnavailableReason.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupNameUnavailableReason.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupParentCreateOptions.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupParentCreateOptions.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupParentCreateOptions.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupParentCreateOptions.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupParentCreateOptions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupParentCreateOptions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupParentCreateOptions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupParentCreateOptions.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupPatch.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupPatch.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupPatch.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupPatch.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupPatch.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupPatch.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupPatch.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupPatch.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupPathElement.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupPathElement.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupPathElement.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupPathElement.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupPathElement.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupPathElement.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupPathElement.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ManagementGroupPathElement.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ParentManagementGroupInfo.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ParentManagementGroupInfo.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ParentManagementGroupInfo.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ParentManagementGroupInfo.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ParentManagementGroupInfo.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ParentManagementGroupInfo.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ParentManagementGroupInfo.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/Models/ParentManagementGroupInfo.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/ResourceManagerModelFactory.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/ResourceManagerModelFactory.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/ResourceManagerModelFactory.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/ResourceManagerModelFactory.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/RestOperations/EntitiesRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/RestOperations/EntitiesRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/RestOperations/EntitiesRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/RestOperations/EntitiesRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/RestOperations/ManagementGroupSubscriptionsRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/RestOperations/ManagementGroupSubscriptionsRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/RestOperations/ManagementGroupSubscriptionsRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/RestOperations/ManagementGroupSubscriptionsRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/RestOperations/ManagementGroupsRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/RestOperations/ManagementGroupsRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ManagementGroup/Generated/RestOperations/ManagementGroupsRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ManagementGroup/Generated/RestOperations/ManagementGroupsRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Properties/AssemblyInfo.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Properties/AssemblyInfo.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Properties/AssemblyInfo.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Properties/AssemblyInfo.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ProviderConstants.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ProviderConstants.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ProviderConstants.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ProviderConstants.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/RehydrationOperation.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/RehydrationOperation.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/RehydrationOperation.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/RehydrationOperation.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/RehydrationOperationOfT.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/RehydrationOperationOfT.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/RehydrationOperationOfT.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/RehydrationOperationOfT.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ResourceManagerExtensions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ResourceManagerExtensions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ResourceManagerExtensions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ResourceManagerExtensions.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/ResourceManagerJsonContext.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/ResourceManagerJsonContext.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/ResourceManagerJsonContext.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/ResourceManagerJsonContext.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/ArmClient.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/ArmClient.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/ArmClient.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/ArmClient.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/ArmRestApiCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/ArmRestApiCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/ArmRestApiCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/ArmRestApiCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Extensions/ArmResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Extensions/ArmResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Extensions/ArmResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Extensions/ArmResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/FeatureResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/FeatureResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/FeatureResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/FeatureResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/GenericResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/GenericResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/GenericResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/GenericResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/GenericResourceCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/GenericResourceCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/GenericResourceCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/GenericResourceCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/GenericResourceData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/GenericResourceData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/GenericResourceData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/GenericResourceData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/HelperSuppressions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/HelperSuppressions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/HelperSuppressions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/HelperSuppressions.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/ArmRestApi.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/ArmRestApi.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/ArmRestApi.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/ArmRestApi.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/ArmRestApi.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/ArmRestApi.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/ArmRestApi.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/ArmRestApi.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/ArmRestApiListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/ArmRestApiListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/ArmRestApiListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/ArmRestApiListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/ArmRestApiListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/ArmRestApiListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/ArmRestApiListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/ArmRestApiListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/EnforcementMode.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/EnforcementMode.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/EnforcementMode.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/EnforcementMode.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/LocationExpanded.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/LocationExpanded.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/LocationExpanded.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/LocationExpanded.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/LocationMetadata.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/LocationMetadata.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/LocationMetadata.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/LocationMetadata.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/ResourcesMoveContent.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/ResourcesMoveContent.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/ResourcesMoveContent.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/ResourcesMoveContent.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/ResourcesSku.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/ResourcesSku.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/ResourcesSku.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/ResourcesSku.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/SubResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/SubResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/SubResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/SubResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/SubResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/SubResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/SubResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/SubResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/Tag.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/Tag.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/Tag.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/Tag.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/WritableSubResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/WritableSubResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/WritableSubResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/WritableSubResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/WritableSubResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/WritableSubResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/Models/WritableSubResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/Models/WritableSubResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/PolicyAssignmentData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/PolicyAssignmentData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/PolicyAssignmentData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/PolicyAssignmentData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/PolicyAssignmentResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/PolicyAssignmentResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/PolicyAssignmentResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/PolicyAssignmentResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/ResourceGroupBuilder.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/ResourceGroupBuilder.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/ResourceGroupBuilder.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/ResourceGroupBuilder.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/ResourceGroupCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/ResourceGroupCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/ResourceGroupCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/ResourceGroupCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/ResourceGroupResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/ResourceGroupResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/ResourceGroupResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/ResourceGroupResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/ResourceManagerModelFactory.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/ResourceManagerModelFactory.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/ResourceManagerModelFactory.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/ResourceManagerModelFactory.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/ResourceProviderCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/ResourceProviderCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/ResourceProviderCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/ResourceProviderCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/ResourceProviderData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/ResourceProviderData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/ResourceProviderData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/ResourceProviderData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/ResourceProviderResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/ResourceProviderResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/ResourceProviderResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/ResourceProviderResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/RestOperations/RestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/RestOperations/RestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/RestOperations/RestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/RestOperations/RestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/RestOperations/TenantsRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/RestOperations/TenantsRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/RestOperations/TenantsRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/RestOperations/TenantsRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/SubscriptionData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/SubscriptionData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/SubscriptionData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/SubscriptionData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/SubscriptionResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/SubscriptionResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/SubscriptionResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/SubscriptionResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/TagResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/TagResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/TagResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/TagResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/TenantCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/TenantCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/TenantCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/TenantCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Custom/TenantResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/TenantResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Custom/TenantResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Custom/TenantResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/DataPolicyManifestCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/DataPolicyManifestCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/DataPolicyManifestCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/DataPolicyManifestCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/DataPolicyManifestData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/DataPolicyManifestData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/DataPolicyManifestData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/DataPolicyManifestData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/DataPolicyManifestData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/DataPolicyManifestData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/DataPolicyManifestData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/DataPolicyManifestData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/DataPolicyManifestResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/DataPolicyManifestResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/DataPolicyManifestResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/DataPolicyManifestResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/DataPolicyManifestResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/DataPolicyManifestResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/DataPolicyManifestResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/DataPolicyManifestResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Extensions/ArmClient.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Extensions/ArmClient.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Extensions/ArmClient.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Extensions/ArmClient.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Extensions/ArmResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Extensions/ArmResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Extensions/ArmResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Extensions/ArmResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Extensions/ManagementGroupResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Extensions/ManagementGroupResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Extensions/ManagementGroupResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Extensions/ManagementGroupResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/FeatureCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/FeatureCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/FeatureCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/FeatureCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/FeatureData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/FeatureData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/FeatureData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/FeatureData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/FeatureData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/FeatureData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/FeatureData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/FeatureData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/FeatureResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/FeatureResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/FeatureResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/FeatureResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/FeatureResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/FeatureResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/FeatureResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/FeatureResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/GenericResourceData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/GenericResourceData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/GenericResourceData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/GenericResourceData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/GenericResourceData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/GenericResourceData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/GenericResourceData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/GenericResourceData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Internal/Utf8JsonRequestContent.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Internal/Utf8JsonRequestContent.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Internal/Utf8JsonRequestContent.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Internal/Utf8JsonRequestContent.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Internal/WirePathAttribute.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Internal/WirePathAttribute.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Internal/WirePathAttribute.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Internal/WirePathAttribute.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/LongRunningOperation/GenericResourceOperationSource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/LongRunningOperation/GenericResourceOperationSource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/LongRunningOperation/GenericResourceOperationSource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/LongRunningOperation/GenericResourceOperationSource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/LongRunningOperation/ResourceGroupExportResultOperationSource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/LongRunningOperation/ResourceGroupExportResultOperationSource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/LongRunningOperation/ResourceGroupExportResultOperationSource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/LongRunningOperation/ResourceGroupExportResultOperationSource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/LongRunningOperation/ResourcesArmOperation.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/LongRunningOperation/ResourcesArmOperation.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/LongRunningOperation/ResourcesArmOperation.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/LongRunningOperation/ResourcesArmOperation.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/LongRunningOperation/ResourcesArmOperationOfT.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/LongRunningOperation/ResourcesArmOperationOfT.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/LongRunningOperation/ResourcesArmOperationOfT.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/LongRunningOperation/ResourcesArmOperationOfT.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/LongRunningOperation/TagResourceOperationSource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/LongRunningOperation/TagResourceOperationSource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/LongRunningOperation/TagResourceOperationSource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/LongRunningOperation/TagResourceOperationSource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicyDefinitionCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicyDefinitionCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicyDefinitionCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicyDefinitionCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicyDefinitionResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicyDefinitionResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicyDefinitionResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicyDefinitionResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicyDefinitionResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicyDefinitionResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicyDefinitionResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicyDefinitionResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicySetDefinitionCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicySetDefinitionCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicySetDefinitionCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicySetDefinitionCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicySetDefinitionResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicySetDefinitionResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicySetDefinitionResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicySetDefinitionResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicySetDefinitionResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicySetDefinitionResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicySetDefinitionResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ManagementGroupPolicySetDefinitionResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ManagementLockCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ManagementLockCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ManagementLockCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ManagementLockCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ManagementLockData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ManagementLockData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ManagementLockData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ManagementLockData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ManagementLockData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ManagementLockData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ManagementLockData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ManagementLockData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ManagementLockResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ManagementLockResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ManagementLockResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ManagementLockResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ManagementLockResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ManagementLockResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ManagementLockResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ManagementLockResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ApiProfile.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ApiProfile.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ApiProfile.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ApiProfile.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ApiProfile.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ApiProfile.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ApiProfile.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ApiProfile.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ArmPolicyParameter.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ArmPolicyParameter.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ArmPolicyParameter.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ArmPolicyParameter.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ArmPolicyParameter.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ArmPolicyParameter.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ArmPolicyParameter.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ArmPolicyParameter.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ArmPolicyParameterType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ArmPolicyParameterType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ArmPolicyParameterType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ArmPolicyParameterType.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ArmPolicyParameterValue.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ArmPolicyParameterValue.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ArmPolicyParameterValue.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ArmPolicyParameterValue.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ArmPolicyParameterValue.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ArmPolicyParameterValue.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ArmPolicyParameterValue.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ArmPolicyParameterValue.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/AvailabilityZoneMappings.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/AvailabilityZoneMappings.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/AvailabilityZoneMappings.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/AvailabilityZoneMappings.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/AvailabilityZoneMappings.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/AvailabilityZoneMappings.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/AvailabilityZoneMappings.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/AvailabilityZoneMappings.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/AzureRoleDefinition.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/AzureRoleDefinition.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/AzureRoleDefinition.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/AzureRoleDefinition.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/AzureRoleDefinition.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/AzureRoleDefinition.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/AzureRoleDefinition.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/AzureRoleDefinition.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/DataManifestCustomResourceFunctionDefinition.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/DataManifestCustomResourceFunctionDefinition.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/DataManifestCustomResourceFunctionDefinition.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/DataManifestCustomResourceFunctionDefinition.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/DataManifestCustomResourceFunctionDefinition.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/DataManifestCustomResourceFunctionDefinition.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/DataManifestCustomResourceFunctionDefinition.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/DataManifestCustomResourceFunctionDefinition.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/DataPolicyManifestEffect.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/DataPolicyManifestEffect.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/DataPolicyManifestEffect.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/DataPolicyManifestEffect.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/DataPolicyManifestEffect.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/DataPolicyManifestEffect.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/DataPolicyManifestEffect.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/DataPolicyManifestEffect.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/DataPolicyManifestListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/DataPolicyManifestListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/DataPolicyManifestListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/DataPolicyManifestListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/DataPolicyManifestListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/DataPolicyManifestListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/DataPolicyManifestListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/DataPolicyManifestListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/EnforcementMode.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/EnforcementMode.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/EnforcementMode.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/EnforcementMode.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ExportTemplate.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ExportTemplate.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ExportTemplate.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ExportTemplate.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ExportTemplate.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ExportTemplate.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ExportTemplate.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ExportTemplate.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ExtendedLocation.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ExtendedLocation.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ExtendedLocation.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ExtendedLocation.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ExtendedLocation.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ExtendedLocation.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ExtendedLocation.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ExtendedLocation.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ExtendedLocationType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ExtendedLocationType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ExtendedLocationType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ExtendedLocationType.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/FeatureOperationsListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/FeatureOperationsListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/FeatureOperationsListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/FeatureOperationsListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/FeatureOperationsListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/FeatureOperationsListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/FeatureOperationsListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/FeatureOperationsListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/FeatureProperties.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/FeatureProperties.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/FeatureProperties.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/FeatureProperties.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/FeatureProperties.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/FeatureProperties.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/FeatureProperties.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/FeatureProperties.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/LocationExpanded.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/LocationExpanded.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/LocationExpanded.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/LocationExpanded.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/LocationExpanded.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/LocationExpanded.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/LocationExpanded.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/LocationExpanded.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/LocationListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/LocationListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/LocationListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/LocationListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/LocationListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/LocationListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/LocationListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/LocationListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/LocationMetadata.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/LocationMetadata.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/LocationMetadata.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/LocationMetadata.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/LocationMetadata.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/LocationMetadata.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/LocationMetadata.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/LocationMetadata.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/LocationType.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/LocationType.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/LocationType.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/LocationType.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/LocationType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/LocationType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/LocationType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/LocationType.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ManagedByTenant.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ManagedByTenant.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ManagedByTenant.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ManagedByTenant.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ManagedByTenant.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ManagedByTenant.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ManagedByTenant.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ManagedByTenant.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ManagementLockLevel.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ManagementLockLevel.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ManagementLockLevel.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ManagementLockLevel.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ManagementLockListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ManagementLockListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ManagementLockListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ManagementLockListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ManagementLockListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ManagementLockListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ManagementLockListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ManagementLockListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ManagementLockOwner.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ManagementLockOwner.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ManagementLockOwner.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ManagementLockOwner.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ManagementLockOwner.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ManagementLockOwner.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ManagementLockOwner.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ManagementLockOwner.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/NonComplianceMessage.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/NonComplianceMessage.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/NonComplianceMessage.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/NonComplianceMessage.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/NonComplianceMessage.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/NonComplianceMessage.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/NonComplianceMessage.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/NonComplianceMessage.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PairedRegion.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PairedRegion.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PairedRegion.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PairedRegion.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PairedRegion.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PairedRegion.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PairedRegion.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PairedRegion.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ParameterDefinitionsValueMetadata.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ParameterDefinitionsValueMetadata.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ParameterDefinitionsValueMetadata.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ParameterDefinitionsValueMetadata.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ParameterDefinitionsValueMetadata.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ParameterDefinitionsValueMetadata.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ParameterDefinitionsValueMetadata.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ParameterDefinitionsValueMetadata.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/Permission.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/Permission.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/Permission.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/Permission.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/Permission.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/Permission.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/Permission.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/Permission.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyAssignmentListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyAssignmentListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyAssignmentListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyAssignmentListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyAssignmentListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyAssignmentListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyAssignmentListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyAssignmentListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyAssignmentPatch.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyAssignmentPatch.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyAssignmentPatch.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyAssignmentPatch.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyAssignmentPatch.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyAssignmentPatch.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyAssignmentPatch.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyAssignmentPatch.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionGroup.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionGroup.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionGroup.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionGroup.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionGroup.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionGroup.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionGroup.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionGroup.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionReference.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionReference.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionReference.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionReference.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionReference.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionReference.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionReference.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyDefinitionReference.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyOverride.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyOverride.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyOverride.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyOverride.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyOverride.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyOverride.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyOverride.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyOverride.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyOverrideKind.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyOverrideKind.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyOverrideKind.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyOverrideKind.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicySetDefinitionListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicySetDefinitionListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicySetDefinitionListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicySetDefinitionListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicySetDefinitionListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicySetDefinitionListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicySetDefinitionListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicySetDefinitionListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PolicyType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PolicyType.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTag.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTag.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTag.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTag.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTag.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTag.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTag.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTag.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagCount.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagCount.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagCount.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagCount.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagCount.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagCount.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagCount.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagCount.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagValue.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagValue.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagValue.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagValue.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagValue.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagValue.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagValue.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagValue.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagsListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagsListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagsListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagsListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagsListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagsListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagsListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/PredefinedTagsListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderAuthorizationConsentState.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderAuthorizationConsentState.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderAuthorizationConsentState.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderAuthorizationConsentState.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderConsentDefinition.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderConsentDefinition.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderConsentDefinition.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderConsentDefinition.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderConsentDefinition.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderConsentDefinition.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderConsentDefinition.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderConsentDefinition.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderExtendedLocation.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderExtendedLocation.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderExtendedLocation.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderExtendedLocation.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderExtendedLocation.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderExtendedLocation.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderExtendedLocation.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderExtendedLocation.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderPermission.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderPermission.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderPermission.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderPermission.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderPermission.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderPermission.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderPermission.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderPermission.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderPermissionListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderPermissionListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderPermissionListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderPermissionListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderPermissionListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderPermissionListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderPermissionListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderPermissionListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderRegistrationContent.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderRegistrationContent.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderRegistrationContent.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderRegistrationContent.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderRegistrationContent.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderRegistrationContent.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderRegistrationContent.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderRegistrationContent.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderResourceType.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderResourceType.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderResourceType.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderResourceType.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderResourceType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderResourceType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderResourceType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderResourceType.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderResourceTypeListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderResourceTypeListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderResourceTypeListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderResourceTypeListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderResourceTypeListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderResourceTypeListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ProviderResourceTypeListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ProviderResourceTypeListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/RegionCategory.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/RegionCategory.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/RegionCategory.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/RegionCategory.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/RegionType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/RegionType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/RegionType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/RegionType.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupExportResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupExportResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupExportResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupExportResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupExportResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupExportResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupExportResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupExportResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupPatch.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupPatch.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupPatch.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupPatch.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupPatch.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupPatch.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupPatch.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupPatch.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupProperties.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupProperties.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupProperties.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupProperties.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupProperties.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupProperties.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupProperties.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceGroupProperties.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceNameValidationContent.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceNameValidationContent.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceNameValidationContent.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceNameValidationContent.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceNameValidationContent.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceNameValidationContent.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceNameValidationContent.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceNameValidationContent.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceNameValidationResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceNameValidationResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceNameValidationResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceNameValidationResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceNameValidationResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceNameValidationResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceNameValidationResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceNameValidationResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceNameValidationStatus.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceNameValidationStatus.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceNameValidationStatus.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceNameValidationStatus.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceProviderListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceProviderListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceProviderListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceProviderListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceProviderListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceProviderListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceProviderListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceProviderListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceSelector.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceSelector.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceSelector.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceSelector.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceSelector.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceSelector.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceSelector.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceSelector.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceSelectorExpression.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceSelectorExpression.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceSelectorExpression.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceSelectorExpression.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceSelectorExpression.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceSelectorExpression.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceSelectorExpression.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceSelectorExpression.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceSelectorKind.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceSelectorKind.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceSelectorKind.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceSelectorKind.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAlias.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAlias.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAlias.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAlias.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAlias.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAlias.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAlias.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAlias.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPath.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPath.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPath.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPath.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPath.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPath.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPath.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPath.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPathAttributes.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPathAttributes.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPathAttributes.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPathAttributes.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPathMetadata.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPathMetadata.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPathMetadata.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPathMetadata.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPathMetadata.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPathMetadata.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPathMetadata.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPathMetadata.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPathTokenType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPathTokenType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPathTokenType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPathTokenType.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPattern.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPattern.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPattern.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPattern.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPattern.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPattern.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPattern.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPattern.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPatternType.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPatternType.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPatternType.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPatternType.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPatternType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPatternType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPatternType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasPatternType.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasType.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasType.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasType.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasType.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliasType.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliases.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliases.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliases.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliases.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliases.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliases.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliases.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourceTypeAliases.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourcesMoveContent.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourcesMoveContent.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourcesMoveContent.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourcesMoveContent.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourcesMoveContent.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourcesMoveContent.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourcesMoveContent.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourcesMoveContent.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourcesSku.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourcesSku.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourcesSku.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourcesSku.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourcesSku.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourcesSku.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ResourcesSku.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ResourcesSku.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/SpendingLimit.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/SpendingLimit.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/SpendingLimit.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/SpendingLimit.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/SpendingLimit.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/SpendingLimit.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/SpendingLimit.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/SpendingLimit.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/SubResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/SubResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/SubResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/SubResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionPolicies.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionPolicies.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionPolicies.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionPolicies.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionPolicies.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionPolicies.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionPolicies.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionPolicies.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionState.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionState.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionState.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionState.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionState.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionState.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionState.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/SubscriptionState.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/Tag.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/Tag.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/Tag.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/Tag.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/Tag.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/Tag.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/Tag.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/Tag.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TagPatchMode.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TagPatchMode.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TagPatchMode.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TagPatchMode.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TagResourcePatch.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TagResourcePatch.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TagResourcePatch.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TagResourcePatch.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TagResourcePatch.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TagResourcePatch.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TagResourcePatch.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TagResourcePatch.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TenantCategory.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TenantCategory.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TenantCategory.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TenantCategory.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TenantCategory.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TenantCategory.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TenantCategory.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TenantCategory.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TenantListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TenantListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TenantListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TenantListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TenantListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TenantListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TenantListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TenantListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TenantResourceProvider.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TenantResourceProvider.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TenantResourceProvider.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TenantResourceProvider.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TenantResourceProvider.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TenantResourceProvider.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TenantResourceProvider.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TenantResourceProvider.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TenantResourceProviderListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TenantResourceProviderListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TenantResourceProviderListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TenantResourceProviderListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TenantResourceProviderListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TenantResourceProviderListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TenantResourceProviderListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TenantResourceProviderListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TrackedResourceExtendedData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TrackedResourceExtendedData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TrackedResourceExtendedData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TrackedResourceExtendedData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TrackedResourceExtendedData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TrackedResourceExtendedData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/TrackedResourceExtendedData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/TrackedResourceExtendedData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ZoneMapping.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ZoneMapping.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ZoneMapping.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ZoneMapping.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ZoneMapping.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ZoneMapping.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/Models/ZoneMapping.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/Models/ZoneMapping.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/PolicyAssignmentCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/PolicyAssignmentCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/PolicyAssignmentCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/PolicyAssignmentCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/PolicyAssignmentData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/PolicyAssignmentData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/PolicyAssignmentData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/PolicyAssignmentData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/PolicyAssignmentData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/PolicyAssignmentData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/PolicyAssignmentData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/PolicyAssignmentData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/PolicyAssignmentResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/PolicyAssignmentResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/PolicyAssignmentResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/PolicyAssignmentResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/PolicyAssignmentResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/PolicyAssignmentResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/PolicyAssignmentResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/PolicyAssignmentResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/PolicyDefinitionData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/PolicyDefinitionData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/PolicyDefinitionData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/PolicyDefinitionData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/PolicyDefinitionData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/PolicyDefinitionData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/PolicyDefinitionData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/PolicyDefinitionData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/PolicySetDefinitionData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/PolicySetDefinitionData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/PolicySetDefinitionData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/PolicySetDefinitionData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/PolicySetDefinitionData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/PolicySetDefinitionData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/PolicySetDefinitionData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/PolicySetDefinitionData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ResourceGroupCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ResourceGroupCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ResourceGroupCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ResourceGroupCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ResourceGroupData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ResourceGroupData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ResourceGroupData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ResourceGroupData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ResourceGroupData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ResourceGroupData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ResourceGroupData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ResourceGroupData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ResourceGroupResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ResourceGroupResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ResourceGroupResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ResourceGroupResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ResourceGroupResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ResourceGroupResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ResourceGroupResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ResourceGroupResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ResourceManagerModelFactory.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ResourceManagerModelFactory.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ResourceManagerModelFactory.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ResourceManagerModelFactory.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ResourceProviderCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ResourceProviderCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ResourceProviderCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ResourceProviderCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ResourceProviderData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ResourceProviderData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ResourceProviderData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ResourceProviderData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ResourceProviderData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ResourceProviderData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ResourceProviderData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ResourceProviderData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ResourceProviderResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ResourceProviderResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ResourceProviderResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ResourceProviderResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ResourceProviderResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ResourceProviderResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/ResourceProviderResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/ResourceProviderResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/DataPolicyManifestsRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/DataPolicyManifestsRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/DataPolicyManifestsRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/DataPolicyManifestsRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/FeaturesRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/FeaturesRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/FeaturesRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/FeaturesRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/ManagementLocksRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/ManagementLocksRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/ManagementLocksRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/ManagementLocksRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/PolicyAssignmentsRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/PolicyAssignmentsRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/PolicyAssignmentsRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/PolicyAssignmentsRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/PolicyDefinitionsRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/PolicyDefinitionsRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/PolicyDefinitionsRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/PolicyDefinitionsRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/PolicySetDefinitionsRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/PolicySetDefinitionsRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/PolicySetDefinitionsRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/PolicySetDefinitionsRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/ProviderResourceTypesRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/ProviderResourceTypesRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/ProviderResourceTypesRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/ProviderResourceTypesRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/ProvidersRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/ProvidersRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/ProvidersRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/ProvidersRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/ResourceGroupsRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/ResourceGroupsRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/ResourceGroupsRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/ResourceGroupsRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/ResourceManagementRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/ResourceManagementRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/ResourceManagementRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/ResourceManagementRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/ResourcesRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/ResourcesRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/ResourcesRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/ResourcesRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/SubscriptionsRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/SubscriptionsRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/SubscriptionsRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/SubscriptionsRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/TagsRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/TagsRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/TagsRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/TagsRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/TenantsRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/TenantsRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/RestOperations/TenantsRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/RestOperations/TenantsRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/SubscriptionCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/SubscriptionCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/SubscriptionCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/SubscriptionCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/SubscriptionData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/SubscriptionData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/SubscriptionData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/SubscriptionData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/SubscriptionData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/SubscriptionData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/SubscriptionData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/SubscriptionData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicyDefinitionCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicyDefinitionCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicyDefinitionCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicyDefinitionCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicyDefinitionResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicyDefinitionResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicyDefinitionResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicyDefinitionResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicyDefinitionResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicyDefinitionResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicyDefinitionResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicyDefinitionResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicySetDefinitionCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicySetDefinitionCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicySetDefinitionCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicySetDefinitionCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicySetDefinitionResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicySetDefinitionResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicySetDefinitionResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicySetDefinitionResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicySetDefinitionResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicySetDefinitionResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicySetDefinitionResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/SubscriptionPolicySetDefinitionResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/SubscriptionResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/SubscriptionResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/SubscriptionResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/SubscriptionResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/SubscriptionResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/SubscriptionResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/SubscriptionResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/SubscriptionResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TagResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TagResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TagResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TagResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TagResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TagResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TagResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TagResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TagResourceData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TagResourceData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TagResourceData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TagResourceData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TagResourceData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TagResourceData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TagResourceData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TagResourceData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TenantCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TenantCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TenantCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TenantCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TenantData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TenantData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TenantData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TenantData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TenantData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TenantData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TenantData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TenantData.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TenantPolicyDefinitionCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TenantPolicyDefinitionCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TenantPolicyDefinitionCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TenantPolicyDefinitionCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TenantPolicyDefinitionResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TenantPolicyDefinitionResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TenantPolicyDefinitionResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TenantPolicyDefinitionResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TenantPolicyDefinitionResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TenantPolicyDefinitionResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TenantPolicyDefinitionResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TenantPolicyDefinitionResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TenantPolicySetDefinitionCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TenantPolicySetDefinitionCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TenantPolicySetDefinitionCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TenantPolicySetDefinitionCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TenantPolicySetDefinitionResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TenantPolicySetDefinitionResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TenantPolicySetDefinitionResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TenantPolicySetDefinitionResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TenantPolicySetDefinitionResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TenantPolicySetDefinitionResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TenantPolicySetDefinitionResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TenantPolicySetDefinitionResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TenantResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TenantResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TenantResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TenantResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TenantResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TenantResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Resources/Generated/TenantResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Resources/Generated/TenantResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/AppContextSwitchHelper.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/AppContextSwitchHelper.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/AppContextSwitchHelper.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/AppContextSwitchHelper.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/AsyncLockWithValue.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/AsyncLockWithValue.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/AsyncLockWithValue.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/AsyncLockWithValue.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/AzureResourceProviderNamespaceAttribute.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/AzureResourceProviderNamespaceAttribute.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/AzureResourceProviderNamespaceAttribute.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/AzureResourceProviderNamespaceAttribute.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/ClientDiagnostics.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/ClientDiagnostics.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/ClientDiagnostics.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/ClientDiagnostics.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/DiagnosticScope.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/DiagnosticScope.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/DiagnosticScope.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/DiagnosticScope.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/DiagnosticScopeFactory.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/DiagnosticScopeFactory.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/DiagnosticScopeFactory.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/DiagnosticScopeFactory.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/FixedDelayWithNoJitterStrategy.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/FixedDelayWithNoJitterStrategy.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/FixedDelayWithNoJitterStrategy.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/FixedDelayWithNoJitterStrategy.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/ForwardsClientCallsAttribute.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/ForwardsClientCallsAttribute.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/ForwardsClientCallsAttribute.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/ForwardsClientCallsAttribute.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/HashCodeBuilder.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/HashCodeBuilder.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/HashCodeBuilder.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/HashCodeBuilder.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/HttpMessageSanitizer.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/HttpMessageSanitizer.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/HttpMessageSanitizer.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/HttpMessageSanitizer.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/HttpPipelineExtensions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/HttpPipelineExtensions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/HttpPipelineExtensions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/HttpPipelineExtensions.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/IOperationSource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/IOperationSource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/IOperationSource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/IOperationSource.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/IUtf8JsonSerializable.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/IUtf8JsonSerializable.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/IUtf8JsonSerializable.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/IUtf8JsonSerializable.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/InitializationConstructorAttribute.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/InitializationConstructorAttribute.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/InitializationConstructorAttribute.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/InitializationConstructorAttribute.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/ManagedServiceIdentityTypeV3Converter.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/ManagedServiceIdentityTypeV3Converter.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/ManagedServiceIdentityTypeV3Converter.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/ManagedServiceIdentityTypeV3Converter.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/NextLinkOperationImplementation.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/NextLinkOperationImplementation.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/NextLinkOperationImplementation.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/NextLinkOperationImplementation.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/NoValueResponseOfT.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/NoValueResponseOfT.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/NoValueResponseOfT.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/NoValueResponseOfT.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/OperationFinalStateVia.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/OperationFinalStateVia.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/OperationFinalStateVia.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/OperationFinalStateVia.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/OperationInternal.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/OperationInternal.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/OperationInternal.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/OperationInternal.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/OperationInternalBase.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/OperationInternalBase.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/OperationInternalBase.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/OperationInternalBase.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/OperationInternalOfT.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/OperationInternalOfT.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/OperationInternalOfT.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/OperationInternalOfT.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/OperationPoller.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/OperationPoller.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/OperationPoller.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/OperationPoller.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/Page.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/Page.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/Page.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/Page.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/PageableHelpers.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/PageableHelpers.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/PageableHelpers.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/PageableHelpers.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/PropertyReferenceTypeAttribute.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/PropertyReferenceTypeAttribute.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/PropertyReferenceTypeAttribute.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/PropertyReferenceTypeAttribute.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/ProtocolOperation.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/ProtocolOperation.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/ProtocolOperation.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/ProtocolOperation.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/RawRequestUriBuilder.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/RawRequestUriBuilder.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/RawRequestUriBuilder.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/RawRequestUriBuilder.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/ReferenceTypeAttribute.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/ReferenceTypeAttribute.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/ReferenceTypeAttribute.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/ReferenceTypeAttribute.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/ResponseErrorConverter.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/ResponseErrorConverter.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/ResponseErrorConverter.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/ResponseErrorConverter.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/SequentialDelayStrategy.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/SequentialDelayStrategy.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/SequentialDelayStrategy.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/SequentialDelayStrategy.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/SerializationConstructorAttribute.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/SerializationConstructorAttribute.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/SerializationConstructorAttribute.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/SerializationConstructorAttribute.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/SharedExtensions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/SharedExtensions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/SharedExtensions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/SharedExtensions.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/TaskExtensions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/TaskExtensions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/TaskExtensions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/TaskExtensions.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/TypeFormatters.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/TypeFormatters.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/TypeFormatters.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/TypeFormatters.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/TypeReferenceTypeAttribute.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/TypeReferenceTypeAttribute.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/TypeReferenceTypeAttribute.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/TypeReferenceTypeAttribute.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/Shared/VoidValue.cs b/tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/VoidValue.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/Shared/VoidValue.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/after/Shared/VoidValue.cs diff --git a/tests/dotnet/dotnet-aot-compat/after/autorest.md b/tests/dotnet-upgrade/dotnet-aot-compat/after/autorest.md similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/autorest.md rename to tests/dotnet-upgrade/dotnet-aot-compat/after/autorest.md diff --git a/tests/dotnet/dotnet-aot-compat/after/global.json b/tests/dotnet-upgrade/dotnet-aot-compat/after/global.json similarity index 100% rename from tests/dotnet/dotnet-aot-compat/after/global.json rename to tests/dotnet-upgrade/dotnet-aot-compat/after/global.json diff --git a/tests/dotnet/dotnet-aot-compat/before/.gitignore b/tests/dotnet-upgrade/dotnet-aot-compat/before/.gitignore similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/.gitignore rename to tests/dotnet-upgrade/dotnet-aot-compat/before/.gitignore diff --git a/tests/dotnet/dotnet-aot-compat/before/ArmClient.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ArmClient.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ArmClient.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ArmClient.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ArmClientOptions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ArmClientOptions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ArmClientOptions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ArmClientOptions.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ArmCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ArmCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ArmCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ArmCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ArmEnvironment.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ArmEnvironment.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ArmEnvironment.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ArmEnvironment.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ArmOperation.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ArmOperation.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ArmOperation.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ArmOperation.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ArmOperationOfT.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ArmOperationOfT.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ArmOperationOfT.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ArmOperationOfT.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ArmResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ArmResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ArmResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ArmResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Assets/Profile/2020-09-01-hybrid.json b/tests/dotnet-upgrade/dotnet-aot-compat/before/Assets/Profile/2020-09-01-hybrid.json similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Assets/Profile/2020-09-01-hybrid.json rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Assets/Profile/2020-09-01-hybrid.json diff --git a/tests/dotnet/dotnet-aot-compat/before/Azure.ResourceManager.csproj b/tests/dotnet-upgrade/dotnet-aot-compat/before/Azure.ResourceManager.csproj similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Azure.ResourceManager.csproj rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Azure.ResourceManager.csproj diff --git a/tests/dotnet/dotnet-aot-compat/before/AzureStackProfile.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/AzureStackProfile.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/AzureStackProfile.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/AzureStackProfile.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/BicepModelReaderWriterOptions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/BicepModelReaderWriterOptions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/BicepModelReaderWriterOptions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/BicepModelReaderWriterOptions.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/CodeGenAttributes.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/CodeGenAttributes.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/CodeGenAttributes.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/CodeGenAttributes.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Custom/Models/ArmPlan.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Custom/Models/ArmPlan.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Custom/Models/ArmPlan.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Custom/Models/ArmPlan.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Custom/Models/ArmSku.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Custom/Models/ArmSku.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Custom/Models/ArmSku.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Custom/Models/ArmSku.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Custom/Models/EncryptionProperties.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Custom/Models/EncryptionProperties.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Custom/Models/EncryptionProperties.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Custom/Models/EncryptionProperties.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Custom/Models/EncryptionStatus.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Custom/Models/EncryptionStatus.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Custom/Models/EncryptionStatus.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Custom/Models/EncryptionStatus.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Custom/Models/KeyVaultProperties.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Custom/Models/KeyVaultProperties.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Custom/Models/KeyVaultProperties.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Custom/Models/KeyVaultProperties.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Custom/Models/ManagedServiceIdentity.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Custom/Models/ManagedServiceIdentity.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Custom/Models/ManagedServiceIdentity.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Custom/Models/ManagedServiceIdentity.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Custom/Models/ManagedServiceIdentity.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Custom/Models/ManagedServiceIdentity.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Custom/Models/ManagedServiceIdentity.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Custom/Models/ManagedServiceIdentity.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Custom/Models/ManagedServiceIdentityType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Custom/Models/ManagedServiceIdentityType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Custom/Models/ManagedServiceIdentityType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Custom/Models/ManagedServiceIdentityType.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Custom/Models/SystemAssignedServiceIdentity.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Custom/Models/SystemAssignedServiceIdentity.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Custom/Models/SystemAssignedServiceIdentity.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Custom/Models/SystemAssignedServiceIdentity.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Custom/Models/SystemAssignedServiceIdentityType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Custom/Models/SystemAssignedServiceIdentityType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Custom/Models/SystemAssignedServiceIdentityType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Custom/Models/SystemAssignedServiceIdentityType.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Custom/ResourceManagerModelFactory.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Custom/ResourceManagerModelFactory.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Custom/ResourceManagerModelFactory.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Custom/ResourceManagerModelFactory.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Internal/Argument.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Internal/Argument.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Internal/Argument.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Internal/Argument.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Internal/BicepSerializationHelpers.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Internal/BicepSerializationHelpers.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Internal/BicepSerializationHelpers.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Internal/BicepSerializationHelpers.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Internal/ChangeTrackingDictionary.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Internal/ChangeTrackingDictionary.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Internal/ChangeTrackingDictionary.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Internal/ChangeTrackingDictionary.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Internal/ChangeTrackingList.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Internal/ChangeTrackingList.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Internal/ChangeTrackingList.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Internal/ChangeTrackingList.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Internal/ModelSerializationExtensions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Internal/ModelSerializationExtensions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Internal/ModelSerializationExtensions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Internal/ModelSerializationExtensions.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Internal/Optional.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Internal/Optional.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Internal/Optional.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Internal/Optional.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Internal/WirePathAttribute.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Internal/WirePathAttribute.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Internal/WirePathAttribute.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Internal/WirePathAttribute.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/ArmPlan.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/ArmPlan.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/ArmPlan.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/ArmPlan.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/ArmPlan.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/ArmPlan.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/ArmPlan.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/ArmPlan.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/ArmSku.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/ArmSku.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/ArmSku.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/ArmSku.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/ArmSku.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/ArmSku.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/ArmSku.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/ArmSku.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/ArmSkuTier.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/ArmSkuTier.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/ArmSkuTier.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/ArmSkuTier.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/ArmSkuTier.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/ArmSkuTier.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/ArmSkuTier.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/ArmSkuTier.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/AzureResourceManagerContext.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/AzureResourceManagerContext.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/AzureResourceManagerContext.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/AzureResourceManagerContext.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/CreatedByType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/CreatedByType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/CreatedByType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/CreatedByType.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/EncryptionProperties.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/EncryptionProperties.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/EncryptionProperties.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/EncryptionProperties.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/EncryptionProperties.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/EncryptionProperties.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/EncryptionProperties.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/EncryptionProperties.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/EncryptionStatus.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/EncryptionStatus.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/EncryptionStatus.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/EncryptionStatus.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/KeyVaultProperties.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/KeyVaultProperties.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/KeyVaultProperties.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/KeyVaultProperties.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/KeyVaultProperties.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/KeyVaultProperties.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/KeyVaultProperties.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/KeyVaultProperties.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/ManagedServiceIdentityType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/ManagedServiceIdentityType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/ManagedServiceIdentityType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/ManagedServiceIdentityType.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/OperationStatusResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/OperationStatusResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/OperationStatusResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/OperationStatusResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/OperationStatusResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/OperationStatusResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/OperationStatusResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/OperationStatusResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/ResourceData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/ResourceData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/ResourceData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/ResourceData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/ResourceData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/ResourceData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/ResourceData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/ResourceData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/SystemAssignedServiceIdentity.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/SystemAssignedServiceIdentity.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/SystemAssignedServiceIdentity.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/SystemAssignedServiceIdentity.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/SystemAssignedServiceIdentity.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/SystemAssignedServiceIdentity.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/SystemAssignedServiceIdentity.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/SystemAssignedServiceIdentity.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/SystemAssignedServiceIdentityType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/SystemAssignedServiceIdentityType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/SystemAssignedServiceIdentityType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/SystemAssignedServiceIdentityType.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/SystemData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/SystemData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/SystemData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/SystemData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/SystemData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/SystemData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/SystemData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/SystemData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/TrackedResourceData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/TrackedResourceData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/TrackedResourceData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/TrackedResourceData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/TrackedResourceData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/TrackedResourceData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/TrackedResourceData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/TrackedResourceData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/UserAssignedIdentity.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/UserAssignedIdentity.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/UserAssignedIdentity.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/UserAssignedIdentity.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/UserAssignedIdentity.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/UserAssignedIdentity.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Common/Generated/Models/UserAssignedIdentity.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Common/Generated/Models/UserAssignedIdentity.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Directory.Build.props b/tests/dotnet-upgrade/dotnet-aot-compat/before/Directory.Build.props similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Directory.Build.props rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Directory.Build.props diff --git a/tests/dotnet/dotnet-aot-compat/before/Directory.Packages.props b/tests/dotnet-upgrade/dotnet-aot-compat/before/Directory.Packages.props similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Directory.Packages.props rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Directory.Packages.props diff --git a/tests/dotnet/dotnet-aot-compat/before/ExperimentalAttribute.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ExperimentalAttribute.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ExperimentalAttribute.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ExperimentalAttribute.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Extensions/ArmClientBuilderExtensions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Extensions/ArmClientBuilderExtensions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Extensions/ArmClientBuilderExtensions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Extensions/ArmClientBuilderExtensions.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/GenericOperationSource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/GenericOperationSource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/GenericOperationSource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/GenericOperationSource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Custom/HelperSuppressions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Custom/HelperSuppressions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Custom/HelperSuppressions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Custom/HelperSuppressions.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Custom/ManagementGroupResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Custom/ManagementGroupResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Custom/ManagementGroupResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Custom/ManagementGroupResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Custom/Models/ManagementGroupNameAvailabilityContent.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Custom/Models/ManagementGroupNameAvailabilityContent.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Custom/Models/ManagementGroupNameAvailabilityContent.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Custom/Models/ManagementGroupNameAvailabilityContent.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Extensions/ArmClient.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Extensions/ArmClient.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Extensions/ArmClient.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Extensions/ArmClient.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Extensions/TenantResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Extensions/TenantResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Extensions/TenantResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Extensions/TenantResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Internal/WirePathAttribute.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Internal/WirePathAttribute.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Internal/WirePathAttribute.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Internal/WirePathAttribute.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/LongRunningOperation/ManagementGroupOperationSource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/LongRunningOperation/ManagementGroupOperationSource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/LongRunningOperation/ManagementGroupOperationSource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/LongRunningOperation/ManagementGroupOperationSource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/LongRunningOperation/ManagementGroupsArmOperation.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/LongRunningOperation/ManagementGroupsArmOperation.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/LongRunningOperation/ManagementGroupsArmOperation.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/LongRunningOperation/ManagementGroupsArmOperation.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/LongRunningOperation/ManagementGroupsArmOperationOfT.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/LongRunningOperation/ManagementGroupsArmOperationOfT.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/LongRunningOperation/ManagementGroupsArmOperationOfT.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/LongRunningOperation/ManagementGroupsArmOperationOfT.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupSubscriptionCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupSubscriptionCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupSubscriptionCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupSubscriptionCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupSubscriptionData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupSubscriptionData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupSubscriptionData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupSubscriptionData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupSubscriptionData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupSubscriptionData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupSubscriptionData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupSubscriptionData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupSubscriptionResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupSubscriptionResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupSubscriptionResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupSubscriptionResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupSubscriptionResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupSubscriptionResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupSubscriptionResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/ManagementGroupSubscriptionResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/CreateManagementGroupDetails.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/CreateManagementGroupDetails.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/CreateManagementGroupDetails.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/CreateManagementGroupDetails.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/CreateManagementGroupDetails.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/CreateManagementGroupDetails.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/CreateManagementGroupDetails.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/CreateManagementGroupDetails.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantParentGroupInfo.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantParentGroupInfo.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantParentGroupInfo.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantParentGroupInfo.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantParentGroupInfo.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantParentGroupInfo.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantParentGroupInfo.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/DescendantParentGroupInfo.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityPermission.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityPermission.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityPermission.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityPermission.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityPermission.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityPermission.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityPermission.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityPermission.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntitySearchOption.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntitySearchOption.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntitySearchOption.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntitySearchOption.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityViewOption.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityViewOption.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityViewOption.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/EntityViewOption.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ListSubscriptionUnderManagementGroup.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ListSubscriptionUnderManagementGroup.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ListSubscriptionUnderManagementGroup.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ListSubscriptionUnderManagementGroup.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ListSubscriptionUnderManagementGroup.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ListSubscriptionUnderManagementGroup.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ListSubscriptionUnderManagementGroup.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ListSubscriptionUnderManagementGroup.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupChildInfo.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupChildInfo.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupChildInfo.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupChildInfo.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupChildInfo.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupChildInfo.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupChildInfo.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupChildInfo.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupChildOptions.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupChildOptions.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupChildOptions.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupChildOptions.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupChildOptions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupChildOptions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupChildOptions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupChildOptions.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupChildType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupChildType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupChildType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupChildType.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupCollectionGetEntitiesOptions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupCollectionGetEntitiesOptions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupCollectionGetEntitiesOptions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupCollectionGetEntitiesOptions.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupCreateOrUpdateContent.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupCreateOrUpdateContent.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupCreateOrUpdateContent.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupCreateOrUpdateContent.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupCreateOrUpdateContent.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupCreateOrUpdateContent.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupCreateOrUpdateContent.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupCreateOrUpdateContent.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupExpandType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupExpandType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupExpandType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupExpandType.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupInfo.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupInfo.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupInfo.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupInfo.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupInfo.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupInfo.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupInfo.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupInfo.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityContent.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityContent.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityContent.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityContent.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityContent.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityContent.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityContent.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityContent.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameAvailabilityResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameUnavailableReason.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameUnavailableReason.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameUnavailableReason.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameUnavailableReason.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameUnavailableReason.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameUnavailableReason.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameUnavailableReason.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupNameUnavailableReason.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupParentCreateOptions.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupParentCreateOptions.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupParentCreateOptions.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupParentCreateOptions.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupParentCreateOptions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupParentCreateOptions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupParentCreateOptions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupParentCreateOptions.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupPatch.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupPatch.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupPatch.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupPatch.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupPatch.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupPatch.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupPatch.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupPatch.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupPathElement.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupPathElement.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupPathElement.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupPathElement.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupPathElement.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupPathElement.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupPathElement.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ManagementGroupPathElement.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ParentManagementGroupInfo.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ParentManagementGroupInfo.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ParentManagementGroupInfo.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ParentManagementGroupInfo.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ParentManagementGroupInfo.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ParentManagementGroupInfo.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ParentManagementGroupInfo.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/Models/ParentManagementGroupInfo.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/ResourceManagerModelFactory.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/ResourceManagerModelFactory.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/ResourceManagerModelFactory.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/ResourceManagerModelFactory.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/RestOperations/EntitiesRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/RestOperations/EntitiesRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/RestOperations/EntitiesRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/RestOperations/EntitiesRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/RestOperations/ManagementGroupSubscriptionsRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/RestOperations/ManagementGroupSubscriptionsRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/RestOperations/ManagementGroupSubscriptionsRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/RestOperations/ManagementGroupSubscriptionsRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/RestOperations/ManagementGroupsRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/RestOperations/ManagementGroupsRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ManagementGroup/Generated/RestOperations/ManagementGroupsRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ManagementGroup/Generated/RestOperations/ManagementGroupsRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Properties/AssemblyInfo.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Properties/AssemblyInfo.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Properties/AssemblyInfo.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Properties/AssemblyInfo.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ProviderConstants.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ProviderConstants.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ProviderConstants.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ProviderConstants.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/RehydrationOperation.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/RehydrationOperation.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/RehydrationOperation.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/RehydrationOperation.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/RehydrationOperationOfT.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/RehydrationOperationOfT.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/RehydrationOperationOfT.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/RehydrationOperationOfT.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/ResourceManagerExtensions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/ResourceManagerExtensions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/ResourceManagerExtensions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/ResourceManagerExtensions.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/ArmClient.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/ArmClient.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/ArmClient.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/ArmClient.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/ArmRestApiCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/ArmRestApiCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/ArmRestApiCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/ArmRestApiCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Extensions/ArmResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Extensions/ArmResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Extensions/ArmResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Extensions/ArmResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/FeatureResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/FeatureResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/FeatureResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/FeatureResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/GenericResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/GenericResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/GenericResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/GenericResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/GenericResourceCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/GenericResourceCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/GenericResourceCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/GenericResourceCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/GenericResourceData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/GenericResourceData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/GenericResourceData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/GenericResourceData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/HelperSuppressions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/HelperSuppressions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/HelperSuppressions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/HelperSuppressions.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/ArmRestApi.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/ArmRestApi.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/ArmRestApi.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/ArmRestApi.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/ArmRestApi.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/ArmRestApi.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/ArmRestApi.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/ArmRestApi.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/ArmRestApiListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/ArmRestApiListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/ArmRestApiListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/ArmRestApiListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/ArmRestApiListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/ArmRestApiListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/ArmRestApiListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/ArmRestApiListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/EnforcementMode.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/EnforcementMode.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/EnforcementMode.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/EnforcementMode.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/LocationExpanded.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/LocationExpanded.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/LocationExpanded.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/LocationExpanded.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/LocationMetadata.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/LocationMetadata.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/LocationMetadata.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/LocationMetadata.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/ResourcesMoveContent.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/ResourcesMoveContent.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/ResourcesMoveContent.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/ResourcesMoveContent.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/ResourcesSku.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/ResourcesSku.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/ResourcesSku.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/ResourcesSku.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/SubResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/SubResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/SubResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/SubResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/SubResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/SubResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/SubResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/SubResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/Tag.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/Tag.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/Tag.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/Tag.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/WritableSubResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/WritableSubResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/WritableSubResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/WritableSubResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/WritableSubResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/WritableSubResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/Models/WritableSubResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/Models/WritableSubResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/PolicyAssignmentData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/PolicyAssignmentData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/PolicyAssignmentData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/PolicyAssignmentData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/PolicyAssignmentResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/PolicyAssignmentResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/PolicyAssignmentResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/PolicyAssignmentResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/ResourceGroupBuilder.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/ResourceGroupBuilder.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/ResourceGroupBuilder.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/ResourceGroupBuilder.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/ResourceGroupCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/ResourceGroupCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/ResourceGroupCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/ResourceGroupCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/ResourceGroupResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/ResourceGroupResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/ResourceGroupResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/ResourceGroupResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/ResourceManagerModelFactory.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/ResourceManagerModelFactory.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/ResourceManagerModelFactory.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/ResourceManagerModelFactory.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/ResourceProviderCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/ResourceProviderCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/ResourceProviderCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/ResourceProviderCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/ResourceProviderData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/ResourceProviderData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/ResourceProviderData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/ResourceProviderData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/ResourceProviderResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/ResourceProviderResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/ResourceProviderResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/ResourceProviderResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/RestOperations/RestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/RestOperations/RestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/RestOperations/RestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/RestOperations/RestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/RestOperations/TenantsRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/RestOperations/TenantsRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/RestOperations/TenantsRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/RestOperations/TenantsRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/SubscriptionData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/SubscriptionData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/SubscriptionData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/SubscriptionData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/SubscriptionResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/SubscriptionResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/SubscriptionResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/SubscriptionResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/TagResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/TagResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/TagResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/TagResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/TenantCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/TenantCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/TenantCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/TenantCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Custom/TenantResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/TenantResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Custom/TenantResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Custom/TenantResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/DataPolicyManifestCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/DataPolicyManifestCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/DataPolicyManifestCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/DataPolicyManifestCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/DataPolicyManifestData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/DataPolicyManifestData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/DataPolicyManifestData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/DataPolicyManifestData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/DataPolicyManifestData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/DataPolicyManifestData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/DataPolicyManifestData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/DataPolicyManifestData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/DataPolicyManifestResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/DataPolicyManifestResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/DataPolicyManifestResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/DataPolicyManifestResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/DataPolicyManifestResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/DataPolicyManifestResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/DataPolicyManifestResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/DataPolicyManifestResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Extensions/ArmClient.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Extensions/ArmClient.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Extensions/ArmClient.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Extensions/ArmClient.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Extensions/ArmResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Extensions/ArmResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Extensions/ArmResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Extensions/ArmResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Extensions/ManagementGroupResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Extensions/ManagementGroupResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Extensions/ManagementGroupResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Extensions/ManagementGroupResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/FeatureCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/FeatureCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/FeatureCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/FeatureCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/FeatureData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/FeatureData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/FeatureData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/FeatureData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/FeatureData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/FeatureData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/FeatureData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/FeatureData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/FeatureResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/FeatureResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/FeatureResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/FeatureResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/FeatureResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/FeatureResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/FeatureResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/FeatureResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/GenericResourceData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/GenericResourceData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/GenericResourceData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/GenericResourceData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/GenericResourceData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/GenericResourceData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/GenericResourceData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/GenericResourceData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Internal/Utf8JsonRequestContent.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Internal/Utf8JsonRequestContent.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Internal/Utf8JsonRequestContent.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Internal/Utf8JsonRequestContent.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Internal/WirePathAttribute.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Internal/WirePathAttribute.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Internal/WirePathAttribute.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Internal/WirePathAttribute.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/LongRunningOperation/GenericResourceOperationSource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/LongRunningOperation/GenericResourceOperationSource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/LongRunningOperation/GenericResourceOperationSource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/LongRunningOperation/GenericResourceOperationSource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/LongRunningOperation/ResourceGroupExportResultOperationSource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/LongRunningOperation/ResourceGroupExportResultOperationSource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/LongRunningOperation/ResourceGroupExportResultOperationSource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/LongRunningOperation/ResourceGroupExportResultOperationSource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/LongRunningOperation/ResourcesArmOperation.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/LongRunningOperation/ResourcesArmOperation.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/LongRunningOperation/ResourcesArmOperation.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/LongRunningOperation/ResourcesArmOperation.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/LongRunningOperation/ResourcesArmOperationOfT.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/LongRunningOperation/ResourcesArmOperationOfT.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/LongRunningOperation/ResourcesArmOperationOfT.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/LongRunningOperation/ResourcesArmOperationOfT.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/LongRunningOperation/TagResourceOperationSource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/LongRunningOperation/TagResourceOperationSource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/LongRunningOperation/TagResourceOperationSource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/LongRunningOperation/TagResourceOperationSource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicyDefinitionCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicyDefinitionCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicyDefinitionCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicyDefinitionCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicyDefinitionResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicyDefinitionResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicyDefinitionResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicyDefinitionResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicyDefinitionResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicyDefinitionResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicyDefinitionResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicyDefinitionResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicySetDefinitionCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicySetDefinitionCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicySetDefinitionCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicySetDefinitionCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicySetDefinitionResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicySetDefinitionResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicySetDefinitionResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicySetDefinitionResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicySetDefinitionResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicySetDefinitionResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicySetDefinitionResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ManagementGroupPolicySetDefinitionResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ManagementLockCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ManagementLockCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ManagementLockCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ManagementLockCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ManagementLockData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ManagementLockData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ManagementLockData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ManagementLockData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ManagementLockData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ManagementLockData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ManagementLockData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ManagementLockData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ManagementLockResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ManagementLockResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ManagementLockResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ManagementLockResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ManagementLockResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ManagementLockResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ManagementLockResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ManagementLockResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ApiProfile.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ApiProfile.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ApiProfile.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ApiProfile.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ApiProfile.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ApiProfile.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ApiProfile.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ApiProfile.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ArmPolicyParameter.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ArmPolicyParameter.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ArmPolicyParameter.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ArmPolicyParameter.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ArmPolicyParameter.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ArmPolicyParameter.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ArmPolicyParameter.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ArmPolicyParameter.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ArmPolicyParameterType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ArmPolicyParameterType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ArmPolicyParameterType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ArmPolicyParameterType.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ArmPolicyParameterValue.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ArmPolicyParameterValue.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ArmPolicyParameterValue.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ArmPolicyParameterValue.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ArmPolicyParameterValue.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ArmPolicyParameterValue.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ArmPolicyParameterValue.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ArmPolicyParameterValue.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/AvailabilityZoneMappings.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/AvailabilityZoneMappings.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/AvailabilityZoneMappings.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/AvailabilityZoneMappings.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/AvailabilityZoneMappings.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/AvailabilityZoneMappings.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/AvailabilityZoneMappings.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/AvailabilityZoneMappings.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/AzureRoleDefinition.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/AzureRoleDefinition.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/AzureRoleDefinition.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/AzureRoleDefinition.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/AzureRoleDefinition.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/AzureRoleDefinition.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/AzureRoleDefinition.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/AzureRoleDefinition.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/DataManifestCustomResourceFunctionDefinition.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/DataManifestCustomResourceFunctionDefinition.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/DataManifestCustomResourceFunctionDefinition.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/DataManifestCustomResourceFunctionDefinition.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/DataManifestCustomResourceFunctionDefinition.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/DataManifestCustomResourceFunctionDefinition.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/DataManifestCustomResourceFunctionDefinition.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/DataManifestCustomResourceFunctionDefinition.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/DataPolicyManifestEffect.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/DataPolicyManifestEffect.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/DataPolicyManifestEffect.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/DataPolicyManifestEffect.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/DataPolicyManifestEffect.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/DataPolicyManifestEffect.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/DataPolicyManifestEffect.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/DataPolicyManifestEffect.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/DataPolicyManifestListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/DataPolicyManifestListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/DataPolicyManifestListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/DataPolicyManifestListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/DataPolicyManifestListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/DataPolicyManifestListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/DataPolicyManifestListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/DataPolicyManifestListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/EnforcementMode.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/EnforcementMode.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/EnforcementMode.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/EnforcementMode.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ExportTemplate.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ExportTemplate.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ExportTemplate.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ExportTemplate.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ExportTemplate.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ExportTemplate.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ExportTemplate.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ExportTemplate.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ExtendedLocation.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ExtendedLocation.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ExtendedLocation.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ExtendedLocation.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ExtendedLocation.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ExtendedLocation.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ExtendedLocation.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ExtendedLocation.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ExtendedLocationType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ExtendedLocationType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ExtendedLocationType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ExtendedLocationType.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/FeatureOperationsListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/FeatureOperationsListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/FeatureOperationsListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/FeatureOperationsListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/FeatureOperationsListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/FeatureOperationsListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/FeatureOperationsListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/FeatureOperationsListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/FeatureProperties.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/FeatureProperties.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/FeatureProperties.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/FeatureProperties.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/FeatureProperties.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/FeatureProperties.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/FeatureProperties.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/FeatureProperties.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/LocationExpanded.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/LocationExpanded.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/LocationExpanded.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/LocationExpanded.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/LocationExpanded.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/LocationExpanded.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/LocationExpanded.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/LocationExpanded.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/LocationListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/LocationListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/LocationListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/LocationListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/LocationListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/LocationListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/LocationListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/LocationListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/LocationMetadata.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/LocationMetadata.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/LocationMetadata.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/LocationMetadata.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/LocationMetadata.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/LocationMetadata.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/LocationMetadata.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/LocationMetadata.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/LocationType.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/LocationType.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/LocationType.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/LocationType.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/LocationType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/LocationType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/LocationType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/LocationType.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ManagedByTenant.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ManagedByTenant.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ManagedByTenant.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ManagedByTenant.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ManagedByTenant.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ManagedByTenant.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ManagedByTenant.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ManagedByTenant.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ManagementLockLevel.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ManagementLockLevel.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ManagementLockLevel.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ManagementLockLevel.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ManagementLockListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ManagementLockListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ManagementLockListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ManagementLockListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ManagementLockListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ManagementLockListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ManagementLockListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ManagementLockListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ManagementLockOwner.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ManagementLockOwner.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ManagementLockOwner.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ManagementLockOwner.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ManagementLockOwner.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ManagementLockOwner.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ManagementLockOwner.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ManagementLockOwner.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/NonComplianceMessage.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/NonComplianceMessage.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/NonComplianceMessage.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/NonComplianceMessage.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/NonComplianceMessage.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/NonComplianceMessage.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/NonComplianceMessage.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/NonComplianceMessage.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PairedRegion.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PairedRegion.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PairedRegion.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PairedRegion.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PairedRegion.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PairedRegion.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PairedRegion.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PairedRegion.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ParameterDefinitionsValueMetadata.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ParameterDefinitionsValueMetadata.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ParameterDefinitionsValueMetadata.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ParameterDefinitionsValueMetadata.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ParameterDefinitionsValueMetadata.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ParameterDefinitionsValueMetadata.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ParameterDefinitionsValueMetadata.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ParameterDefinitionsValueMetadata.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/Permission.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/Permission.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/Permission.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/Permission.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/Permission.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/Permission.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/Permission.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/Permission.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyAssignmentListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyAssignmentListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyAssignmentListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyAssignmentListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyAssignmentListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyAssignmentListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyAssignmentListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyAssignmentListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyAssignmentPatch.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyAssignmentPatch.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyAssignmentPatch.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyAssignmentPatch.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyAssignmentPatch.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyAssignmentPatch.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyAssignmentPatch.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyAssignmentPatch.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionGroup.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionGroup.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionGroup.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionGroup.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionGroup.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionGroup.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionGroup.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionGroup.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionReference.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionReference.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionReference.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionReference.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionReference.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionReference.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionReference.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyDefinitionReference.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyOverride.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyOverride.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyOverride.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyOverride.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyOverride.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyOverride.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyOverride.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyOverride.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyOverrideKind.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyOverrideKind.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyOverrideKind.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyOverrideKind.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicySetDefinitionListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicySetDefinitionListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicySetDefinitionListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicySetDefinitionListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicySetDefinitionListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicySetDefinitionListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicySetDefinitionListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicySetDefinitionListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PolicyType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PolicyType.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTag.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTag.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTag.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTag.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTag.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTag.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTag.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTag.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagCount.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagCount.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagCount.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagCount.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagCount.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagCount.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagCount.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagCount.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagValue.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagValue.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagValue.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagValue.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagValue.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagValue.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagValue.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagValue.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagsListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagsListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagsListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagsListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagsListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagsListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagsListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/PredefinedTagsListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderAuthorizationConsentState.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderAuthorizationConsentState.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderAuthorizationConsentState.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderAuthorizationConsentState.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderConsentDefinition.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderConsentDefinition.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderConsentDefinition.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderConsentDefinition.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderConsentDefinition.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderConsentDefinition.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderConsentDefinition.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderConsentDefinition.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderExtendedLocation.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderExtendedLocation.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderExtendedLocation.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderExtendedLocation.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderExtendedLocation.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderExtendedLocation.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderExtendedLocation.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderExtendedLocation.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderPermission.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderPermission.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderPermission.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderPermission.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderPermission.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderPermission.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderPermission.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderPermission.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderPermissionListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderPermissionListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderPermissionListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderPermissionListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderPermissionListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderPermissionListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderPermissionListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderPermissionListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderRegistrationContent.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderRegistrationContent.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderRegistrationContent.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderRegistrationContent.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderRegistrationContent.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderRegistrationContent.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderRegistrationContent.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderRegistrationContent.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderResourceType.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderResourceType.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderResourceType.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderResourceType.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderResourceType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderResourceType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderResourceType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderResourceType.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderResourceTypeListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderResourceTypeListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderResourceTypeListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderResourceTypeListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderResourceTypeListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderResourceTypeListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ProviderResourceTypeListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ProviderResourceTypeListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/RegionCategory.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/RegionCategory.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/RegionCategory.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/RegionCategory.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/RegionType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/RegionType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/RegionType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/RegionType.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupExportResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupExportResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupExportResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupExportResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupExportResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupExportResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupExportResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupExportResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupPatch.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupPatch.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupPatch.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupPatch.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupPatch.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupPatch.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupPatch.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupPatch.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupProperties.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupProperties.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupProperties.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupProperties.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupProperties.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupProperties.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupProperties.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceGroupProperties.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceNameValidationContent.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceNameValidationContent.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceNameValidationContent.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceNameValidationContent.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceNameValidationContent.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceNameValidationContent.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceNameValidationContent.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceNameValidationContent.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceNameValidationResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceNameValidationResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceNameValidationResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceNameValidationResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceNameValidationResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceNameValidationResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceNameValidationResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceNameValidationResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceNameValidationStatus.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceNameValidationStatus.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceNameValidationStatus.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceNameValidationStatus.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceProviderListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceProviderListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceProviderListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceProviderListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceProviderListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceProviderListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceProviderListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceProviderListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceSelector.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceSelector.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceSelector.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceSelector.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceSelector.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceSelector.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceSelector.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceSelector.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceSelectorExpression.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceSelectorExpression.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceSelectorExpression.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceSelectorExpression.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceSelectorExpression.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceSelectorExpression.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceSelectorExpression.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceSelectorExpression.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceSelectorKind.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceSelectorKind.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceSelectorKind.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceSelectorKind.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAlias.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAlias.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAlias.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAlias.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAlias.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAlias.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAlias.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAlias.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPath.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPath.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPath.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPath.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPath.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPath.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPath.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPath.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPathAttributes.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPathAttributes.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPathAttributes.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPathAttributes.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPathMetadata.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPathMetadata.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPathMetadata.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPathMetadata.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPathMetadata.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPathMetadata.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPathMetadata.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPathMetadata.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPathTokenType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPathTokenType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPathTokenType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPathTokenType.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPattern.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPattern.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPattern.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPattern.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPattern.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPattern.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPattern.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPattern.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPatternType.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPatternType.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPatternType.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPatternType.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPatternType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPatternType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPatternType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasPatternType.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasType.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasType.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasType.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasType.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasType.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasType.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasType.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliasType.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliases.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliases.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliases.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliases.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliases.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliases.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliases.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourceTypeAliases.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourcesMoveContent.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourcesMoveContent.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourcesMoveContent.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourcesMoveContent.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourcesMoveContent.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourcesMoveContent.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourcesMoveContent.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourcesMoveContent.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourcesSku.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourcesSku.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourcesSku.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourcesSku.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourcesSku.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourcesSku.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ResourcesSku.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ResourcesSku.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/SpendingLimit.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/SpendingLimit.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/SpendingLimit.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/SpendingLimit.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/SpendingLimit.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/SpendingLimit.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/SpendingLimit.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/SpendingLimit.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/SubResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/SubResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/SubResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/SubResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionPolicies.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionPolicies.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionPolicies.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionPolicies.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionPolicies.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionPolicies.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionPolicies.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionPolicies.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionState.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionState.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionState.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionState.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionState.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionState.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionState.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/SubscriptionState.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/Tag.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/Tag.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/Tag.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/Tag.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/Tag.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/Tag.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/Tag.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/Tag.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TagPatchMode.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TagPatchMode.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TagPatchMode.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TagPatchMode.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TagResourcePatch.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TagResourcePatch.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TagResourcePatch.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TagResourcePatch.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TagResourcePatch.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TagResourcePatch.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TagResourcePatch.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TagResourcePatch.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TenantCategory.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TenantCategory.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TenantCategory.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TenantCategory.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TenantCategory.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TenantCategory.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TenantCategory.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TenantCategory.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TenantListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TenantListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TenantListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TenantListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TenantListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TenantListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TenantListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TenantListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TenantResourceProvider.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TenantResourceProvider.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TenantResourceProvider.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TenantResourceProvider.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TenantResourceProvider.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TenantResourceProvider.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TenantResourceProvider.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TenantResourceProvider.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TenantResourceProviderListResult.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TenantResourceProviderListResult.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TenantResourceProviderListResult.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TenantResourceProviderListResult.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TenantResourceProviderListResult.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TenantResourceProviderListResult.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TenantResourceProviderListResult.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TenantResourceProviderListResult.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TrackedResourceExtendedData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TrackedResourceExtendedData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TrackedResourceExtendedData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TrackedResourceExtendedData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TrackedResourceExtendedData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TrackedResourceExtendedData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/TrackedResourceExtendedData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/TrackedResourceExtendedData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ZoneMapping.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ZoneMapping.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ZoneMapping.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ZoneMapping.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ZoneMapping.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ZoneMapping.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/Models/ZoneMapping.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/Models/ZoneMapping.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/PolicyAssignmentCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/PolicyAssignmentCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/PolicyAssignmentCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/PolicyAssignmentCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/PolicyAssignmentData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/PolicyAssignmentData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/PolicyAssignmentData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/PolicyAssignmentData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/PolicyAssignmentData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/PolicyAssignmentData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/PolicyAssignmentData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/PolicyAssignmentData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/PolicyAssignmentResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/PolicyAssignmentResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/PolicyAssignmentResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/PolicyAssignmentResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/PolicyAssignmentResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/PolicyAssignmentResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/PolicyAssignmentResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/PolicyAssignmentResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/PolicyDefinitionData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/PolicyDefinitionData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/PolicyDefinitionData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/PolicyDefinitionData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/PolicyDefinitionData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/PolicyDefinitionData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/PolicyDefinitionData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/PolicyDefinitionData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/PolicySetDefinitionData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/PolicySetDefinitionData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/PolicySetDefinitionData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/PolicySetDefinitionData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/PolicySetDefinitionData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/PolicySetDefinitionData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/PolicySetDefinitionData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/PolicySetDefinitionData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ResourceGroupCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ResourceGroupCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ResourceGroupCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ResourceGroupCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ResourceGroupData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ResourceGroupData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ResourceGroupData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ResourceGroupData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ResourceGroupData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ResourceGroupData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ResourceGroupData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ResourceGroupData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ResourceGroupResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ResourceGroupResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ResourceGroupResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ResourceGroupResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ResourceGroupResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ResourceGroupResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ResourceGroupResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ResourceGroupResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ResourceManagerModelFactory.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ResourceManagerModelFactory.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ResourceManagerModelFactory.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ResourceManagerModelFactory.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ResourceProviderCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ResourceProviderCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ResourceProviderCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ResourceProviderCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ResourceProviderData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ResourceProviderData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ResourceProviderData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ResourceProviderData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ResourceProviderData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ResourceProviderData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ResourceProviderData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ResourceProviderData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ResourceProviderResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ResourceProviderResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ResourceProviderResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ResourceProviderResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ResourceProviderResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ResourceProviderResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/ResourceProviderResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/ResourceProviderResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/DataPolicyManifestsRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/DataPolicyManifestsRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/DataPolicyManifestsRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/DataPolicyManifestsRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/FeaturesRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/FeaturesRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/FeaturesRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/FeaturesRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/ManagementLocksRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/ManagementLocksRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/ManagementLocksRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/ManagementLocksRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/PolicyAssignmentsRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/PolicyAssignmentsRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/PolicyAssignmentsRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/PolicyAssignmentsRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/PolicyDefinitionsRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/PolicyDefinitionsRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/PolicyDefinitionsRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/PolicyDefinitionsRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/PolicySetDefinitionsRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/PolicySetDefinitionsRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/PolicySetDefinitionsRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/PolicySetDefinitionsRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/ProviderResourceTypesRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/ProviderResourceTypesRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/ProviderResourceTypesRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/ProviderResourceTypesRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/ProvidersRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/ProvidersRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/ProvidersRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/ProvidersRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/ResourceGroupsRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/ResourceGroupsRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/ResourceGroupsRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/ResourceGroupsRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/ResourceManagementRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/ResourceManagementRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/ResourceManagementRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/ResourceManagementRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/ResourcesRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/ResourcesRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/ResourcesRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/ResourcesRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/SubscriptionsRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/SubscriptionsRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/SubscriptionsRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/SubscriptionsRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/TagsRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/TagsRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/TagsRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/TagsRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/TenantsRestOperations.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/TenantsRestOperations.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/RestOperations/TenantsRestOperations.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/RestOperations/TenantsRestOperations.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/SubscriptionCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/SubscriptionCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/SubscriptionCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/SubscriptionCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/SubscriptionData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/SubscriptionData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/SubscriptionData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/SubscriptionData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/SubscriptionData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/SubscriptionData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/SubscriptionData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/SubscriptionData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicyDefinitionCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicyDefinitionCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicyDefinitionCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicyDefinitionCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicyDefinitionResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicyDefinitionResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicyDefinitionResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicyDefinitionResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicyDefinitionResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicyDefinitionResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicyDefinitionResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicyDefinitionResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicySetDefinitionCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicySetDefinitionCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicySetDefinitionCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicySetDefinitionCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicySetDefinitionResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicySetDefinitionResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicySetDefinitionResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicySetDefinitionResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicySetDefinitionResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicySetDefinitionResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicySetDefinitionResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/SubscriptionPolicySetDefinitionResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/SubscriptionResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/SubscriptionResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/SubscriptionResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/SubscriptionResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/SubscriptionResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/SubscriptionResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/SubscriptionResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/SubscriptionResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TagResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TagResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TagResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TagResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TagResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TagResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TagResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TagResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TagResourceData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TagResourceData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TagResourceData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TagResourceData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TagResourceData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TagResourceData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TagResourceData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TagResourceData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TenantCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TenantCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TenantCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TenantCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TenantData.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TenantData.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TenantData.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TenantData.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TenantData.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TenantData.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TenantData.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TenantData.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TenantPolicyDefinitionCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TenantPolicyDefinitionCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TenantPolicyDefinitionCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TenantPolicyDefinitionCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TenantPolicyDefinitionResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TenantPolicyDefinitionResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TenantPolicyDefinitionResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TenantPolicyDefinitionResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TenantPolicyDefinitionResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TenantPolicyDefinitionResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TenantPolicyDefinitionResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TenantPolicyDefinitionResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TenantPolicySetDefinitionCollection.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TenantPolicySetDefinitionCollection.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TenantPolicySetDefinitionCollection.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TenantPolicySetDefinitionCollection.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TenantPolicySetDefinitionResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TenantPolicySetDefinitionResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TenantPolicySetDefinitionResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TenantPolicySetDefinitionResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TenantPolicySetDefinitionResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TenantPolicySetDefinitionResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TenantPolicySetDefinitionResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TenantPolicySetDefinitionResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TenantResource.Serialization.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TenantResource.Serialization.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TenantResource.Serialization.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TenantResource.Serialization.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TenantResource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TenantResource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Resources/Generated/TenantResource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Resources/Generated/TenantResource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/AppContextSwitchHelper.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/AppContextSwitchHelper.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/AppContextSwitchHelper.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/AppContextSwitchHelper.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/AsyncLockWithValue.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/AsyncLockWithValue.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/AsyncLockWithValue.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/AsyncLockWithValue.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/AzureResourceProviderNamespaceAttribute.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/AzureResourceProviderNamespaceAttribute.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/AzureResourceProviderNamespaceAttribute.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/AzureResourceProviderNamespaceAttribute.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/ClientDiagnostics.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/ClientDiagnostics.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/ClientDiagnostics.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/ClientDiagnostics.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/DiagnosticScope.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/DiagnosticScope.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/DiagnosticScope.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/DiagnosticScope.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/DiagnosticScopeFactory.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/DiagnosticScopeFactory.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/DiagnosticScopeFactory.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/DiagnosticScopeFactory.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/FixedDelayWithNoJitterStrategy.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/FixedDelayWithNoJitterStrategy.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/FixedDelayWithNoJitterStrategy.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/FixedDelayWithNoJitterStrategy.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/ForwardsClientCallsAttribute.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/ForwardsClientCallsAttribute.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/ForwardsClientCallsAttribute.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/ForwardsClientCallsAttribute.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/HashCodeBuilder.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/HashCodeBuilder.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/HashCodeBuilder.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/HashCodeBuilder.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/HttpMessageSanitizer.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/HttpMessageSanitizer.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/HttpMessageSanitizer.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/HttpMessageSanitizer.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/HttpPipelineExtensions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/HttpPipelineExtensions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/HttpPipelineExtensions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/HttpPipelineExtensions.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/IOperationSource.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/IOperationSource.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/IOperationSource.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/IOperationSource.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/IUtf8JsonSerializable.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/IUtf8JsonSerializable.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/IUtf8JsonSerializable.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/IUtf8JsonSerializable.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/InitializationConstructorAttribute.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/InitializationConstructorAttribute.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/InitializationConstructorAttribute.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/InitializationConstructorAttribute.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/ManagedServiceIdentityTypeV3Converter.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/ManagedServiceIdentityTypeV3Converter.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/ManagedServiceIdentityTypeV3Converter.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/ManagedServiceIdentityTypeV3Converter.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/NextLinkOperationImplementation.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/NextLinkOperationImplementation.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/NextLinkOperationImplementation.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/NextLinkOperationImplementation.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/NoValueResponseOfT.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/NoValueResponseOfT.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/NoValueResponseOfT.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/NoValueResponseOfT.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/OperationFinalStateVia.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/OperationFinalStateVia.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/OperationFinalStateVia.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/OperationFinalStateVia.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/OperationInternal.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/OperationInternal.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/OperationInternal.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/OperationInternal.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/OperationInternalBase.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/OperationInternalBase.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/OperationInternalBase.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/OperationInternalBase.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/OperationInternalOfT.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/OperationInternalOfT.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/OperationInternalOfT.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/OperationInternalOfT.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/OperationPoller.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/OperationPoller.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/OperationPoller.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/OperationPoller.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/Page.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/Page.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/Page.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/Page.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/PageableHelpers.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/PageableHelpers.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/PageableHelpers.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/PageableHelpers.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/PropertyReferenceTypeAttribute.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/PropertyReferenceTypeAttribute.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/PropertyReferenceTypeAttribute.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/PropertyReferenceTypeAttribute.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/ProtocolOperation.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/ProtocolOperation.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/ProtocolOperation.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/ProtocolOperation.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/RawRequestUriBuilder.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/RawRequestUriBuilder.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/RawRequestUriBuilder.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/RawRequestUriBuilder.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/ReferenceTypeAttribute.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/ReferenceTypeAttribute.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/ReferenceTypeAttribute.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/ReferenceTypeAttribute.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/SequentialDelayStrategy.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/SequentialDelayStrategy.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/SequentialDelayStrategy.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/SequentialDelayStrategy.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/SerializationConstructorAttribute.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/SerializationConstructorAttribute.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/SerializationConstructorAttribute.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/SerializationConstructorAttribute.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/SharedExtensions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/SharedExtensions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/SharedExtensions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/SharedExtensions.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/TaskExtensions.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/TaskExtensions.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/TaskExtensions.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/TaskExtensions.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/TypeFormatters.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/TypeFormatters.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/TypeFormatters.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/TypeFormatters.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/TypeReferenceTypeAttribute.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/TypeReferenceTypeAttribute.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/TypeReferenceTypeAttribute.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/TypeReferenceTypeAttribute.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/Shared/VoidValue.cs b/tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/VoidValue.cs similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/Shared/VoidValue.cs rename to tests/dotnet-upgrade/dotnet-aot-compat/before/Shared/VoidValue.cs diff --git a/tests/dotnet/dotnet-aot-compat/before/autorest.md b/tests/dotnet-upgrade/dotnet-aot-compat/before/autorest.md similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/autorest.md rename to tests/dotnet-upgrade/dotnet-aot-compat/before/autorest.md diff --git a/tests/dotnet/dotnet-aot-compat/before/global.json b/tests/dotnet-upgrade/dotnet-aot-compat/before/global.json similarity index 100% rename from tests/dotnet/dotnet-aot-compat/before/global.json rename to tests/dotnet-upgrade/dotnet-aot-compat/before/global.json diff --git a/tests/dotnet/dotnet-aot-compat/eval.yaml b/tests/dotnet-upgrade/dotnet-aot-compat/eval.yaml similarity index 100% rename from tests/dotnet/dotnet-aot-compat/eval.yaml rename to tests/dotnet-upgrade/dotnet-aot-compat/eval.yaml diff --git a/tests/dotnet/migrate-nullable-references/Test-GetNullableReadiness.ps1 b/tests/dotnet-upgrade/migrate-nullable-references/Test-GetNullableReadiness.ps1 similarity index 100% rename from tests/dotnet/migrate-nullable-references/Test-GetNullableReadiness.ps1 rename to tests/dotnet-upgrade/migrate-nullable-references/Test-GetNullableReadiness.ps1 diff --git a/tests/dotnet/migrate-nullable-references/eval.yaml b/tests/dotnet-upgrade/migrate-nullable-references/eval.yaml similarity index 100% rename from tests/dotnet/migrate-nullable-references/eval.yaml rename to tests/dotnet-upgrade/migrate-nullable-references/eval.yaml diff --git a/tests/dotnet/migrate-nullable-references/fixtures/nrt-disabled/Formatter.cs b/tests/dotnet-upgrade/migrate-nullable-references/fixtures/nrt-disabled/Formatter.cs similarity index 100% rename from tests/dotnet/migrate-nullable-references/fixtures/nrt-disabled/Formatter.cs rename to tests/dotnet-upgrade/migrate-nullable-references/fixtures/nrt-disabled/Formatter.cs diff --git a/tests/dotnet/migrate-nullable-references/fixtures/nrt-disabled/NrtDisabled.csproj b/tests/dotnet-upgrade/migrate-nullable-references/fixtures/nrt-disabled/NrtDisabled.csproj similarity index 100% rename from tests/dotnet/migrate-nullable-references/fixtures/nrt-disabled/NrtDisabled.csproj rename to tests/dotnet-upgrade/migrate-nullable-references/fixtures/nrt-disabled/NrtDisabled.csproj diff --git a/tests/dotnet/migrate-nullable-references/fixtures/nrt-disabled/UserService.cs b/tests/dotnet-upgrade/migrate-nullable-references/fixtures/nrt-disabled/UserService.cs similarity index 100% rename from tests/dotnet/migrate-nullable-references/fixtures/nrt-disabled/UserService.cs rename to tests/dotnet-upgrade/migrate-nullable-references/fixtures/nrt-disabled/UserService.cs diff --git a/tests/dotnet/migrate-nullable-references/fixtures/nrt-enabled/NrtEnabled.csproj b/tests/dotnet-upgrade/migrate-nullable-references/fixtures/nrt-enabled/NrtEnabled.csproj similarity index 100% rename from tests/dotnet/migrate-nullable-references/fixtures/nrt-enabled/NrtEnabled.csproj rename to tests/dotnet-upgrade/migrate-nullable-references/fixtures/nrt-enabled/NrtEnabled.csproj diff --git a/tests/dotnet/migrate-nullable-references/fixtures/nrt-enabled/UserService.cs b/tests/dotnet-upgrade/migrate-nullable-references/fixtures/nrt-enabled/UserService.cs similarity index 100% rename from tests/dotnet/migrate-nullable-references/fixtures/nrt-enabled/UserService.cs rename to tests/dotnet-upgrade/migrate-nullable-references/fixtures/nrt-enabled/UserService.cs diff --git a/tests/dotnet/migrate-nullable-references/fixtures/nrt-partial/CleanFile.cs b/tests/dotnet-upgrade/migrate-nullable-references/fixtures/nrt-partial/CleanFile.cs similarity index 100% rename from tests/dotnet/migrate-nullable-references/fixtures/nrt-partial/CleanFile.cs rename to tests/dotnet-upgrade/migrate-nullable-references/fixtures/nrt-partial/CleanFile.cs diff --git a/tests/dotnet/migrate-nullable-references/fixtures/nrt-partial/LegacyHelper.cs b/tests/dotnet-upgrade/migrate-nullable-references/fixtures/nrt-partial/LegacyHelper.cs similarity index 100% rename from tests/dotnet/migrate-nullable-references/fixtures/nrt-partial/LegacyHelper.cs rename to tests/dotnet-upgrade/migrate-nullable-references/fixtures/nrt-partial/LegacyHelper.cs diff --git a/tests/dotnet/migrate-nullable-references/fixtures/nrt-partial/NrtPartial.csproj b/tests/dotnet-upgrade/migrate-nullable-references/fixtures/nrt-partial/NrtPartial.csproj similarity index 100% rename from tests/dotnet/migrate-nullable-references/fixtures/nrt-partial/NrtPartial.csproj rename to tests/dotnet-upgrade/migrate-nullable-references/fixtures/nrt-partial/NrtPartial.csproj diff --git a/tests/dotnet/thread-abort-migration/eval.yaml b/tests/dotnet-upgrade/thread-abort-migration/eval.yaml similarity index 100% rename from tests/dotnet/thread-abort-migration/eval.yaml rename to tests/dotnet-upgrade/thread-abort-migration/eval.yaml