remove the setting for sample output folder (#5351)

* remove the setting for sample output folder and make it to always be the tests project's directory

* regen

* update the sample directory logic

* remove the unexpected generated files

Author: ArcturusZhang

src/AutoRest.CSharp/Common/AutoRest/Plugins/CSharpProj.cs

@@ -69,15 +69,7 @@ private void WriteCSProjFiles(Action<string, string> writeFile)
             if (Configuration.MgmtTestConfiguration is not null)
             {
                 var testCSProjContent = GetTestCSProj();
-                string testGenProjectFolder;
-                if (Configuration.MgmtTestConfiguration.OutputFolder is { } testGenProjectOutputFolder)
-                {
-                    testGenProjectFolder = Path.Combine(testGenProjectOutputFolder, "../");
-                }
-                else
-                {
-                    testGenProjectFolder = "../";
-                }
+                string testGenProjectFolder = "../";
                 Console.WriteLine(Path.Combine(testGenProjectFolder, $"{Configuration.Namespace}.Tests.csproj"));
                 writeFile(FormatPath(Path.Combine(testGenProjectFolder, $"{Configuration.Namespace}.Tests.csproj")), testCSProjContent);
             }

src/AutoRest.CSharp/Mgmt/AutoRest/MgmtTarget.cs

@@ -251,12 +251,15 @@ public static async Task ExecuteAsync(GeneratedCodeWorkspace project)
             // write samples if enabled
             if (Configuration.MgmtTestConfiguration?.Sample ?? Configuration.GenerateSampleProject)
             {
-                string sampleOutputFolder = GetSampleOutputFolder(SAMPLE_DEFAULT_OUTPUT_PATH);
-                foreach (var sampleProvider in MgmtContext.Library.SampleProviders.Value)
+                var sampleOutputFolder = GetSampleOutputFolder();
+                if (sampleOutputFolder is not null)
                 {
-                    var sampleWriter = new CodeWriter();
-                    new ExpressionTypeProviderWriter(sampleWriter, sampleProvider).Write();
-                    project.AddGeneratedTestFile(Path.Combine(sampleOutputFolder, $"Samples/{sampleProvider.Type.Name}.cs"), sampleWriter.ToString());
+                    foreach (var sampleProvider in MgmtContext.Library.SampleProviders.Value)
+                    {
+                        var sampleWriter = new CodeWriter();
+                        new ExpressionTypeProviderWriter(sampleWriter, sampleProvider).Write();
+                        project.AddGeneratedTestFile(Path.Combine(sampleOutputFolder, $"Samples/{sampleProvider.Type.Name}.cs"), sampleWriter.ToString());
+                    }
                 }
             }
         }
@@ -336,25 +339,17 @@ private static void WriteSerialization(GeneratedCodeWorkspace project, TypeProvi
             AddGeneratedFile(project, serializationFileName, serializerCodeWriter.ToString());
         }
 
-        private const string SOURCE_DEFAULT_OUTPUT_PATH = $"/src/Generated";
-        private const string MOCK_TEST_DEFAULT_OUTPUT_PATH = "/tests/Generated";
-        private const string SAMPLE_DEFAULT_OUTPUT_PATH = "/samples/Generated";
-
-        private static string GetSampleOutputFolder(string defaultOutputPath)
+        private static string? GetSampleOutputFolder()
         {
-            if (!string.IsNullOrEmpty(Configuration.MgmtTestConfiguration?.OutputFolder))
-                return Configuration.MgmtTestConfiguration.OutputFolder;
-
             string folder = FormatPath(Configuration.OutputFolder);
-            // if the output folder is not given explicitly, try to figure it out from general output folder if possible according to default folder structure:
-            // Azure.ResourceManager.XXX \ src \ Generated <- default sdk source output folder
-            //                           \ samples(or tests) \ Generated <- default sample output folder defined in msbuild
-            if (folder.EndsWith(SOURCE_DEFAULT_OUTPUT_PATH, StringComparison.InvariantCultureIgnoreCase))
-                return Path.Combine(folder, $"../../{defaultOutputPath}");
-            else if (folder.EndsWith(SAMPLE_DEFAULT_OUTPUT_PATH, StringComparison.InvariantCultureIgnoreCase) || folder.EndsWith(MOCK_TEST_DEFAULT_OUTPUT_PATH, StringComparison.InvariantCultureIgnoreCase))
-                return folder;
-            else
-                throw new InvalidOperationException("'sample-gen.output-folder' is not configured and can't figure it out from give general output-folder");
+            // we find the `src` part and change it to tests
+            var index = folder.IndexOf("/src/", StringComparison.InvariantCultureIgnoreCase);
+            if (index >= 0)
+            {
+                return folder.Replace("/src/", "/tests/", StringComparison.InvariantCultureIgnoreCase);
+            }
+            // indicates we cannot figure out an output folder for samples, we will not generate samples
+            return null;
         }
 
         private static string FormatPath(string? path)

src/AutoRest.CSharp/Mgmt/AutoRest/MgmtTestConfiguration.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Text.Json;
 using AutoRest.CSharp.AutoRest.Communication;
@@ -17,7 +16,6 @@ internal class MgmtTestConfiguration
         private const string TestGenOptionsFormat = $"{TestGenOptionsRoot}.{{0}}";
 
         public string? SourceCodePath { get; }
-        public string? OutputFolder { get; }
         public bool Sample { get; }
         public IReadOnlyList<string> SkippedOperations { get; }
         public bool ClearOutputFolder { get; }
@@ -26,13 +24,11 @@ public MgmtTestConfiguration(
             IReadOnlyList<string> skippedOperations,
             JsonElement? sourceCodePath = default,
             JsonElement? sample = default,
-            JsonElement? outputFolder = default,
             JsonElement? clearOutputFolder = default)
         {
             SkippedOperations = skippedOperations;
             SourceCodePath = !Configuration.IsValidJsonElement(sourceCodePath) ? null : sourceCodePath.ToString();
             Sample = Configuration.DeserializeBoolean(sample, true);
-            OutputFolder = !Configuration.IsValidJsonElement(outputFolder) ? null : Configuration.TrimFileSuffix(outputFolder.ToString() ?? "");
             ClearOutputFolder = Configuration.DeserializeBoolean(clearOutputFolder, false);
         }
 
@@ -46,7 +42,6 @@ public MgmtTestConfiguration(
             testGenRoot.TryGetProperty(Options.SkippedOperations, out var skippedOperationsElement);
             testGenRoot.TryGetProperty(Options.SourcePath, out var sourceCodePath);
             testGenRoot.TryGetProperty(Options.Sample, out var sample);
-            testGenRoot.TryGetProperty(Options.OutputFolder, out var testGenOutputFolder);
             testGenRoot.TryGetProperty(Options.ClearOutputFolder, out var testGenClearOutputFolder);
 
             var skippedOperations = Configuration.DeserializeArray(skippedOperationsElement);
@@ -55,7 +50,6 @@ public MgmtTestConfiguration(
                 skippedOperations,
                 sourceCodePath: sourceCodePath,
                 sample: sample,
-                outputFolder: testGenOutputFolder,
                 clearOutputFolder: testGenClearOutputFolder);
         }
 
@@ -68,7 +62,6 @@ public MgmtTestConfiguration(
                 skippedOperations: autoRest.GetValue<string[]?>(string.Format(TestGenOptionsFormat, "skipped-operations")).GetAwaiter().GetResult() ?? Array.Empty<string>(),
                 sourceCodePath: autoRest.GetValue<JsonElement?>(string.Format(TestGenOptionsFormat, "source-path")).GetAwaiter().GetResult(),
                 sample: autoRest.GetValue<JsonElement?>(string.Format(TestGenOptionsFormat, "sample")).GetAwaiter().GetResult(),
-                outputFolder: autoRest.GetValue<JsonElement?>(string.Format(TestGenOptionsFormat, "output-folder")).GetAwaiter().GetResult(),
                 clearOutputFolder: autoRest.GetValue<JsonElement?>(string.Format(TestGenOptionsFormat, "clear-output-folder")).GetAwaiter().GetResult());
         }
 
@@ -80,8 +73,6 @@ private static class Options
 
             internal const string Sample = "sample";
 
-            internal const string OutputFolder = "output-folder";
-
             internal const string ClearOutputFolder = "clear-output-folder";
         }
 
@@ -97,9 +88,6 @@ internal void SaveConfiguration(Utf8JsonWriter writer)
             if (Sample)
                 writer.WriteBoolean(Options.Sample, Sample);
 
-            if (OutputFolder is not null)
-                writer.WriteString(Options.OutputFolder, Path.GetRelativePath(Configuration.OutputFolder, OutputFolder));
-
             if (!ClearOutputFolder)
                 writer.WriteBoolean(Options.ClearOutputFolder, ClearOutputFolder);
 

test/TestProjects/MgmtMockAndSample/src/Generated/Configuration.json

@@ -26,7 +26,6 @@ modelerfour:
 include-x-ms-examples-original-file: false
 sample-gen:
   sample: true
-  output-folder: $(this-folder)../tests/Generated
   clear-output-folder: true
   skipped-operations: # only to test if the configuration works
   - Vaults_GetDeleted