merge: resolve conflicts with main (take Generate.ps1 from main, temp resolve tspCodeModel.json)

Co-authored-by: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com>

Author: Copilot

docs/samples/client/csharp/SampleService/main.tsp

@@ -19,34 +19,6 @@ if (-not $LaunchOnly) {
 
     if ($null -eq $filter -or $filter -eq "Sample-TypeSpec") {
 
-       # TODO: Re-enable SampleService plugin generation once a compatible emitter version is published
-       # Write-Host "Building logging plugin" -ForegroundColor Cyan
-       # $pluginDir = Join-Path $packageRoot '..' '..' 'docs' 'samples' 'client' 'csharp' 'plugins' 'logging' 'Logging.Plugin' 'src'
-       # Invoke "dotnet build" $pluginDir
-
-      #  $sampleDir = Join-Path $packageRoot '..' '..' 'docs' 'samples' 'client' 'csharp' 'SampleService'
-
-      #  Write-Host "Installing SampleTypeSpec plugins" -ForegroundColor Cyan
-
-      #  Invoke "npm install --no-package-lock" $sampleDir
-
-       # Write-Host "Generating SampleTypeSpec using plugins" -ForegroundColor Cyan
-
-       # Invoke "npx tsp compile . --trace @typespec/http-client-csharp" $sampleDir
-
-       # # exit if the generation failed
-       # if ($LASTEXITCODE -ne 0) {
-       #   exit $LASTEXITCODE
-       # }
-
-       # Write-Host "Building SampleTypeSpec plugin library" -ForegroundColor Cyan
-       # Invoke "dotnet build $sampleDir/SampleClient/src/SampleTypeSpec.csproj"
-
-       # # exit if the generation failed
-       # if ($LASTEXITCODE -ne 0) {
-       #   exit $LASTEXITCODE
-       # }
-
         Write-Host "Generating SampleTypeSpec" -ForegroundColor Cyan
         $testProjectsLocalDir = Join-Path $packageRoot 'generator' 'TestProjects' 'Local'
 

packages/http-client-csharp/eng/scripts/Generate.ps1

@@ -111,7 +111,7 @@ protected virtual string GetSolutionFileContent()
         {
             return string.Format(
                 @"<Solution>
-  <Project Path=""src\{0}.csproj"" />
+  <Project Path=""src/{0}.csproj"" />
 </Solution>
 ", CodeModelGenerator.Instance.Configuration.PackageName);
         }

packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/Primitives/NewProjectScaffolding.cs

@@ -70,6 +70,18 @@ public async Task Execute_CleansUpOldSlnxFiles()
             Assert.IsFalse(File.Exists(oldSlnxPath));
         }
 
+        [Test]
+        public async Task Execute_SlnxUsesForwardSlashes()
+        {
+            var scaffolding = new NewProjectScaffolding();
+            await scaffolding.Execute();
+
+            var slnxPath = Path.Combine(_outputDir, "TestPackage.slnx");
+            var content = await File.ReadAllTextAsync(slnxPath);
+            Assert.That(content, Does.Contain("src/TestPackage.csproj"));
+            Assert.That(content, Does.Not.Contain("src\\TestPackage.csproj"));
+        }
+
         [Test]
         public async Task Execute_CallsWriteAdditionalFiles()
         {

packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/Primitives/NewProjectScaffoldingTests.cs

@@ -4,16 +4,16 @@
     "Clients": {
       "type": "object",
       "properties": {
-        "Notebooks": {
+        "Metrics": {
           "type": "object",
-          "description": "Configuration for Notebooks.",
+          "description": "Configuration for Metrics.",
           "properties": {
             "SampleTypeSpecUrl": {
               "type": "string",
               "format": "uri",
               "description": "Gets or sets the SampleTypeSpecUrl."
             },
-            "Notebook": {
+            "MetricsNamespace": {
               "type": "string"
             },
             "Credential": {
@@ -24,16 +24,16 @@
             }
           }
         },
-        "Metrics": {
+        "Notebooks": {
           "type": "object",
-          "description": "Configuration for Metrics.",
+          "description": "Configuration for Notebooks.",
           "properties": {
             "SampleTypeSpecUrl": {
               "type": "string",
               "format": "uri",
               "description": "Gets or sets the SampleTypeSpecUrl."
             },
-            "MetricsNamespace": {
+            "Notebook": {
               "type": "string"
             },
             "Credential": {