Skip to content

Commit 197a80c

Browse files
committed
Merge branch 'agentserver/first-release' into agentserver/1.0.0-beta.2-fix
2 parents 75624ac + c4ace9b commit 197a80c

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

eng/Packages.Data.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -372,12 +372,12 @@
372372
<PackageReference Update="Microsoft.ApplicationInsights.WorkerService" Version="2.23.0" />
373373
<PackageReference Update="Microsoft.Azure.ApplicationInsights.Query" Version="1.0.0" />
374374
<PackageReference Update="Microsoft.AspNetCore" Version="2.2.0" />
375-
<PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" Version="8.*" />
375+
<PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.21" />
376376
<PackageReference Update="Microsoft.AspNetCore.Server.Kestrel" Version="2.3.0" />
377377
<PackageReference Update="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.3.6" />
378378
<PackageReference Update="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.3.0" />
379379
<PackageReference Update="Microsoft.AspNetCore.Server.WebListener" Version="1.1.4" />
380-
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="8.*" />
380+
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="8.0.21" />
381381
<PackageReference Update="Microsoft.AspNetCore.Http" Version="2.3.0" />
382382
<PackageReference Update="Microsoft.Azure.Core.Spatial" Version="1.0.0" />
383383
<PackageReference Update="Microsoft.Azure.Core.NewtonsoftJson" Version="1.0.0" />
@@ -482,8 +482,8 @@
482482
or '$(IsStressProject)' == 'true'
483483
or '$(IsSamplesProject)' == 'true'
484484
)">
485-
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="9.*" />
486-
<PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" Version="9.*" />
485+
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="9.0.10" />
486+
<PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.10" />
487487
</ItemGroup>
488488

489489
<ItemGroup Condition="'$(IsClientLibrary)' == 'true' and $(MSBuildProjectName.StartsWith('Microsoft.ClientModel.TestFramework'))">

eng/scripts/Language-Settings.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function Get-AllPackageInfoFromRepo($serviceDirectory)
1717
$shouldAddDevVersion = Get-Variable -Name 'addDevVersion' -ValueOnly -ErrorAction 'Ignore'
1818
$ServiceProj = Join-Path -Path $EngDir -ChildPath "service.proj"
1919
$outputFilePath = Join-Path ([System.IO.Path]::GetTempPath()) "package-info-$([System.Guid]::NewGuid()).txt"
20-
20+
2121
Write-Host "dotnet msbuild /nologo /t:GetPackageInfo ""$ServiceProj"" /p:ServiceDirectory=$serviceDirectory /p:AddDevVersion=$shouldAddDevVersion /p:OutputProjectInfoListFilePath=""$outputFilePath"" -tl:off"
2222

2323
dotnet msbuild `
@@ -77,8 +77,8 @@ function Get-AllPackageInfoFromRepo($serviceDirectory)
7777
}
7878
}
7979

80-
# CheckAOTCompat logic: if set in CI.yml, respect that value;
81-
# if artifact has baselined warnings, run AOT checks;
80+
# CheckAOTCompat logic: if set in CI.yml, respect that value;
81+
# if artifact has baselined warnings, run AOT checks;
8282
# otherwise use AotCompatOptOut from project settings
8383
$shouldAot = GetValueSafelyFrom-Yaml $ciProps.ParsedYml @("extends", "parameters", "CheckAOTCompat")
8484
if ($null -ne $shouldAot) {

0 commit comments

Comments
 (0)