Skip to content

Commit 9443392

Browse files
live1206live1206
authored
Update Azure.Generator as pacakge refernece for MPG generator (Azure#49603)
1 parent 1f7f254 commit 9443392

File tree

8 files changed

+16
-45
lines changed

8 files changed

+16
-45
lines changed

‎eng/Packages.Data.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@
207207

208208
<ItemGroup Condition="'$(IsGeneratorLibrary)' == 'true'">
209209
<PackageReference Update="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250422.2" />
210+
<PackageReference Update="Azure.Generator" Version="1.0.0-alpha.20250423.3" />
210211
<PackageReference Update="System.ClientModel" Version="1.3.0" />
211212
</ItemGroup>
212213

‎eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Mgmt.sln‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Generator.Mgmt", "Azu
77
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Generator.Mgmt.Tests", "Azure.Generator.Mgmt\test\Azure.Generator.Mgmt.Tests\Azure.Generator.Mgmt.Tests.csproj", "{236F0049-E44C-40C9-90BB-BD19495CB689}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Generator", "..\..\http-client-csharp\generator\Azure.Generator\src\Azure.Generator.csproj", "{FE6FA205-40EA-400A-A6F5-A0CA9F839DA5}"
11-
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Generator.Tests", "..\..\http-client-csharp\generator\Azure.Generator\test\Azure.Generator.Tests.csproj", "{BCDD6207-A9D5-4DFB-A31C-8187D9FFF045}"
13-
EndProject
1410
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProjects.Local.Tests", "TestProjects\Local.Tests\TestProjects.Local.Tests.csproj", "{E6E6C66A-E1E2-4D4D-9E8A-FD97A1761F90}"
1511
EndProject
1612
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Generator.Tests.Common", "..\..\http-client-csharp\generator\Azure.Generator\test\common\Azure.Generator.Tests.Common.csproj", "{5C43C4D9-AC67-6643-B7AF-DF8096B8265A}"
@@ -29,14 +25,6 @@ Global
2925
{236F0049-E44C-40C9-90BB-BD19495CB689}.Debug|Any CPU.Build.0 = Debug|Any CPU
3026
{236F0049-E44C-40C9-90BB-BD19495CB689}.Release|Any CPU.ActiveCfg = Release|Any CPU
3127
{236F0049-E44C-40C9-90BB-BD19495CB689}.Release|Any CPU.Build.0 = Release|Any CPU
32-
{FE6FA205-40EA-400A-A6F5-A0CA9F839DA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33-
{FE6FA205-40EA-400A-A6F5-A0CA9F839DA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
34-
{FE6FA205-40EA-400A-A6F5-A0CA9F839DA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
35-
{FE6FA205-40EA-400A-A6F5-A0CA9F839DA5}.Release|Any CPU.Build.0 = Release|Any CPU
36-
{BCDD6207-A9D5-4DFB-A31C-8187D9FFF045}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37-
{BCDD6207-A9D5-4DFB-A31C-8187D9FFF045}.Debug|Any CPU.Build.0 = Debug|Any CPU
38-
{BCDD6207-A9D5-4DFB-A31C-8187D9FFF045}.Release|Any CPU.ActiveCfg = Release|Any CPU
39-
{BCDD6207-A9D5-4DFB-A31C-8187D9FFF045}.Release|Any CPU.Build.0 = Release|Any CPU
4028
{E6E6C66A-E1E2-4D4D-9E8A-FD97A1761F90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4129
{E6E6C66A-E1E2-4D4D-9E8A-FD97A1761F90}.Debug|Any CPU.Build.0 = Debug|Any CPU
4230
{E6E6C66A-E1E2-4D4D-9E8A-FD97A1761F90}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Mgmt/src/Azure.Generator.Mgmt.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,9 @@
55
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
66
</PropertyGroup>
77

8-
<ItemGroup>
9-
<ProjectReference Include="..\..\..\..\http-client-csharp\generator\Azure.Generator\src\Azure.Generator.csproj" />
10-
</ItemGroup>
11-
128
<ItemGroup>
139
<PackageReference Include="Azure.Core" />
10+
<PackageReference Include="Azure.Generator" />
1411
<PackageReference Include="Azure.ResourceManager" />
1512
<PackageReference Include="Microsoft.TypeSpec.Generator.ClientModel" />
1613
</ItemGroup>

‎eng/packages/http-client-csharp-mgmt/package-lock.json‎

Lines changed: 5 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎eng/packages/http-client-csharp-mgmt/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"dist/**"
3838
],
3939
"dependencies": {
40-
"@azure-typespec/http-client-csharp": "1.0.0-alpha.20250419.1"
40+
"@azure-typespec/http-client-csharp": "1.0.0-alpha.20250423.3"
4141
},
4242
"devDependencies": {
4343
"@azure-tools/azure-http-specs": "0.1.0-alpha.13",

‎eng/packages/http-client-csharp/generator/Azure.Generator/test/common/InputFactory.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ public static InputModelProperty Property(
235235
/// <returns></returns>
236236
public static InputModelType Model(
237237
string name,
238-
string clientNamespace = "Sample.Models",
238+
string clientNamespace = "Samples.Models",
239239
string access = "public",
240240
InputModelTypeUsage usage = InputModelTypeUsage.Output | InputModelTypeUsage.Input | InputModelTypeUsage.Json,
241241
IEnumerable<InputModelProperty>? properties = null,

‎eng/scripts/typespec/Build-Emitter.ps1‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ function Pack-And-Write-Info {
9797
$versionOption = "/p:Version=$version"
9898
$hasReleaseVersionOption = $version.Contains("alpha") ? "/p:HasReleaseVersion=false" : ""
9999
Invoke-LoggedCommand "dotnet pack ./$package/src/$package.csproj $versionOption $hasReleaseVersionOption -c Release -o $outputPath"
100-
Write-PackageInfo -packageName $package -directoryPath "eng/packages/http-client-csharp/generator/$package/src" -version $version
100+
Write-PackageInfo -packageName $package -directoryPath "$emitterPackagePath/generator/$package/src" -version $version
101101
}
102102

103103

@@ -115,17 +115,19 @@ Build-Emitter -packageRoot $packageRoot -outputPath $outputPath -overrides $over
115115

116116
# Pack the generator
117117
Push-Location "$packageRoot/generator"
118+
$generatorSolutionFile = Get-ChildItem -Path . -Filter "*.sln" -File | Select-Object -First 1
119+
$generatorName = $generatorSolutionFile.BaseName
118120
try {
119121
Write-Host "Working in $PWD"
120-
Pack-And-Write-Info -package "Azure.Generator" -version $GeneratorVersion -outputPath $outputPath
122+
Pack-And-Write-Info -package $generatorName -version $GeneratorVersion -outputPath $outputPath
121123
}
122124
finally
123125
{
124126
Pop-Location
125127
}
126128

127129
$packageMatrix = [ordered]@{
128-
"azure.generator" = $generatorVersion
130+
$generatorName.ToLower() = $generatorVersion
129131
}
130132

131133
$packageMatrix | ConvertTo-Json | Set-Content "$outputPath/package-versions.json"

‎eng/scripts/typespec/Test-Emitter.ps1‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ Push-Location $packageRoot
6565
try {
6666
Build-Emitter -packageRoot $packageRoot -testResultsPath $testResultsPath
6767

68-
if ($UnitTests) {
68+
# we only run spector test for Azure emitter
69+
if ($UnitTests -and $EmitterPackagePath.EndsWith("http-client-csharp")) {
6970
Invoke-LoggedCommand "$packageRoot/eng/scripts/Get-Spector-Coverage.ps1" -GroupOutput
7071

7172
$testResultsFile = "$packageRoot/generator/artifacts/coverage/tsp-spector-coverage-azure.json"

0 commit comments

Comments
 (0)