Skip to content

Commit e77551a

Browse files
committed
Merge branch 'feature/v3' of github.com:Azure/autorest.csharp into support_lro_rehydration
2 parents 5881c40 + 761af80 commit e77551a

File tree

205 files changed

+13506
-7045
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

205 files changed

+13506
-7045
lines changed

eng/Generate.ps1

+8
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,9 @@ if (!($Exclude -contains "CadlRanchProjects"))
255255
}
256256
}
257257

258+
# TODO: remove later after cadl-ranch fixes the discriminator tests
259+
Add-Cadl "inheritance-cadl" (Join-Path $cadlRanchProjectDirectory "inheritance")
260+
258261
# Smoke tests
259262
if (!($Exclude -contains "SmokeTests"))
260263
{
@@ -306,6 +309,11 @@ foreach ($key in Sort-FileSafe ($testProjectEntries.Keys)) {
306309
continue;
307310
}
308311

312+
# TODO: remove later after candl ranch fixes the discriminator test
313+
if ($definition.output.Contains("\CadlRanchProjects\inheritance")) {
314+
continue;
315+
}
316+
309317
$outputPath = Join-Path $definition.output "Generated"
310318
if ($key -eq "TypeSchemaMapping")
311319
{

package-lock.json

+10-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1122,7 +1122,7 @@ namespace Azure.Service.Models
11221122

11231123
```yaml
11241124
# autorest-core version
1125-
version: 3.8.4
1125+
version: 3.9.3
11261126
save-inputs: true
11271127
use: $(this-folder)/artifacts/bin/AutoRest.CSharp/Debug/netcoreapp3.1/
11281128
clear-output-folder: true

0 commit comments

Comments
 (0)