it is so complicated to make everything compile

microsoft · Jan 9, 2025 · fd933a7 · fd933a7
1 parent c426628
commit fd933a7
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 8 deletions.
diff --git a/...harp/generator/TestProjects/CadlRanch.Tests/Http/Client/Structure/Default/DefaultTests.cs b/...harp/generator/TestProjects/CadlRanch.Tests/Http/Client/Structure/Default/DefaultTests.cs
@@ -5,7 +5,8 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Client.Structure.Service;
-using Client.Structure.Service.Default;
+using Client.Structure.Service._Baz;
+using Client.Structure.Service._Qux;
 using NUnit.Framework;
 
 namespace TestProjects.CadlRanch.Tests.Http.Client.Structure.Default

diff --git a/...-csharp/generator/TestProjects/CadlRanch.Tests/Http/Encode/Duration/EncodeDurationTest.cs b/...-csharp/generator/TestProjects/CadlRanch.Tests/Http/Encode/Duration/EncodeDurationTest.cs
@@ -6,7 +6,7 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 using Encode.Duration;
-using Encode.Duration.Models;
+using Encode.Duration._Property;
 using NUnit.Framework;
 
 namespace TestProjects.CadlRanch.Tests.Http.Encode.Duration

diff --git a/...t-csharp/generator/TestProjects/CadlRanch.Tests/Http/Encode/Numeric/EncodeNumericTests.cs b/...t-csharp/generator/TestProjects/CadlRanch.Tests/Http/Encode/Numeric/EncodeNumericTests.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 using Encode.Numeric;
-using Encode.Numeric.Models;
+using Encode.Numeric._Property;
 using NUnit.Framework;
 
 namespace TestProjects.CadlRanch.Tests.Http.Encode.Numeric

diff --git a/...p/generator/TestProjects/CadlRanch.Tests/Http/Resiliency/SrvDriven/V1/SrvDrivenV1Tests.cs b/...p/generator/TestProjects/CadlRanch.Tests/Http/Resiliency/SrvDriven/V1/SrvDrivenV1Tests.cs
@@ -1,9 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using NUnit.Framework;
-using Resiliency.SrvDriven.V1;
 using System.Threading.Tasks;
+using NUnit.Framework;
+using Resiliency.ServiceDriven;
+using Resiliency.SrvDriven.V2;
 
 namespace TestProjects.CadlRanch.Tests.Http.Resiliency.SrvDriven.V1
 {

diff --git a/...p/generator/TestProjects/CadlRanch.Tests/Http/Resiliency/SrvDriven/V2/SrvDrivenV2Tests.cs b/...p/generator/TestProjects/CadlRanch.Tests/Http/Resiliency/SrvDriven/V2/SrvDrivenV2Tests.cs
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using NUnit.Framework;
 using System.Threading.Tasks;
-using Resiliency.SrvDriven.V2;
+using NUnit.Framework;
+using Resiliency.ServiceDriven;
 
 namespace TestProjects.CadlRanch.Tests.Http.Resiliency.SrvDriven.V2
 {

diff --git a/....Tests/Http/Versioning/ReturnTypeChangedFrom/V2/VersioningReturnTypeChangedFromV2Tests.cs b/....Tests/Http/Versioning/ReturnTypeChangedFrom/V2/VersioningReturnTypeChangedFromV2Tests.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 using NUnit.Framework;
-using Versioning.ReturnTypeChangedFrom.V2;
+using Versioning.ReturnTypeChangedFrom;
 
 namespace TestProjects.CadlRanch.Tests.Http.Versioning.ReturnTypeChangedFrom.V2
 {

diff --git a/...-client-csharp/generator/TestProjects/CadlRanch.Tests/TestProjects.CadlRanch.Tests.csproj b/...-client-csharp/generator/TestProjects/CadlRanch.Tests/TestProjects.CadlRanch.Tests.csproj
@@ -40,6 +40,34 @@
     <Compile Remove="../CadlRanch/**/TestModel.Serialization.cs" /> <!-- Remove the duplicated class from multiple projects -->
     <Compile Include="../CadlRanch/http/versioning/madeOptional/v1/src/Generated/Models/TestModel.Serialization.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
     <Compile Include="../CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/Models/TestModel.Serialization.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
+    <Compile Remove="../CadlRanch/**/ResiliencyServiceDrivenClient.cs" /> <!-- Remove the duplicated class from multiple projects -->
+    <Compile Include="../CadlRanch/http/resiliency/srv-driven/v2/src/Generated/ResiliencyServiceDrivenClient.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
+    <Compile Remove="../CadlRanch/**/ResiliencyServiceDrivenClientOptions.cs" /> <!-- Remove the duplicated class from multiple projects -->
+    <Compile Include="../CadlRanch/http/resiliency/srv-driven/v2/src/Generated/ResiliencyServiceDrivenClientOptions.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
+    <Compile Remove="../CadlRanch/**/AddedClient.cs" /> <!-- Remove the duplicated class from multiple projects -->
+    <Compile Include="../CadlRanch/http/versioning/added/v1/src/Generated/AddedClient.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
+    <Compile Remove="../CadlRanch/**/AddedClientOptions.cs" /> <!-- Remove the duplicated class from multiple projects -->
+    <Compile Include="../CadlRanch/http/versioning/added/v1/src/Generated/AddedClientOptions.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
+    <Compile Remove="../CadlRanch/**/RenamedFromClient.cs" /> <!-- Remove the duplicated class from multiple projects -->
+    <Compile Include="../CadlRanch/http/versioning/renamedFrom/v1/src/Generated/RenamedFromClient.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
+    <Compile Remove="../CadlRanch/**/RenamedFromClientOptions.cs" /> <!-- Remove the duplicated class from multiple projects -->
+    <Compile Include="../CadlRanch/http/versioning/renamedFrom/v1/src/Generated/RenamedFromClientOptions.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
+    <Compile Remove="../CadlRanch/**/TypeChangedFromClient.cs" /> <!-- Remove the duplicated class from multiple projects -->
+    <Compile Include="../CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/TypeChangedFromClient.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
+    <Compile Remove="../CadlRanch/**/TypeChangedFromClientOptions.cs" /> <!-- Remove the duplicated class from multiple projects -->
+    <Compile Include="../CadlRanch/http/versioning/typeChangedFrom/v1/src/Generated/TypeChangedFromClientOptions.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
+    <Compile Remove="../CadlRanch/**/ReturnTypeChangedFromClient.cs" /> <!-- Remove the duplicated class from multiple projects -->
+    <Compile Include="../CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/ReturnTypeChangedFromClient.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
+    <Compile Remove="../CadlRanch/**/ReturnTypeChangedFromClientOptions.cs" /> <!-- Remove the duplicated class from multiple projects -->
+    <Compile Include="../CadlRanch/http/versioning/returnTypeChangedFrom/v1/src/Generated/ReturnTypeChangedFromClientOptions.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
+    <Compile Remove="../CadlRanch/**/RemovedClient.cs" /> <!-- Remove the duplicated class from multiple projects -->
+    <Compile Include="../CadlRanch/http/versioning/removed/v1/src/Generated/RemovedClient.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
+    <Compile Remove="../CadlRanch/**/RemovedClientOptions.cs" /> <!-- Remove the duplicated class from multiple projects -->
+    <Compile Include="../CadlRanch/http/versioning/removed/v1/src/Generated/RemovedClientOptions.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
+    <Compile Remove="../CadlRanch/**/InterfaceV1.cs" /> <!-- Remove the duplicated class from multiple projects -->
+    <Compile Include="../CadlRanch/http/versioning/removed/v1/src/Generated/InterfaceV1.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
+    <Compile Remove="../CadlRanch/**/MadeOptionalClient.cs" /> <!-- Remove the duplicated class from multiple projects -->
+    <Compile Include="../CadlRanch/http/versioning/madeOptional/v1/src/Generated/MadeOptionalClient.cs" Link="Projects/%(RecursiveDir)/%(Filename)%(Extension)" /> <!-- Add one specific version back in -->
   </ItemGroup>
 
   <ItemGroup>