Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging internal commits for release/7.0 #52045

Merged
Merged
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
390f705
Merge in 'release/7.0' changes
dotnet-bot Aug 31, 2023
7ae8e21
[internal/release/7.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Aug 31, 2023
3240a7c
[internal/release/7.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Sep 1, 2023
a617bbc
Merge in 'release/7.0' changes
dotnet-bot Sep 1, 2023
f869d19
Merge in 'release/7.0' changes
dotnet-bot Sep 1, 2023
9bb94f3
[internal/release/7.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Sep 2, 2023
12f7067
[internal/release/7.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Sep 5, 2023
9e447a7
Merge in 'release/7.0' changes
dotnet-bot Sep 6, 2023
b056b7a
Prevent submission of EditForm after disposal
SteveSandersonMS Sep 6, 2023
bef3688
Merge in 'release/7.0' changes
dotnet-bot Sep 12, 2023
7d0ed67
[internal/release/7.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Sep 13, 2023
3fc454f
[internal/release/7.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Sep 13, 2023
46170f5
[internal/release/7.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Sep 14, 2023
3245d13
Merge in 'release/7.0' changes
dotnet-bot Sep 14, 2023
3b98a55
Merged PR 33717: Updated Version.Details.xml - revert sha for System.…
vseanreesermsft Sep 15, 2023
1a9cd2d
Merge in 'release/7.0' changes
dotnet-bot Oct 4, 2023
5f71e8a
Merge in 'release/7.0' changes
dotnet-bot Oct 4, 2023
eaee595
Merge in 'release/7.0' changes
dotnet-bot Oct 4, 2023
e4c7821
Merge in 'release/7.0' changes
dotnet-bot Oct 5, 2023
a0f21aa
[internal/release/7.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Oct 11, 2023
cfc713f
[internal/release/7.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Oct 12, 2023
fe85e51
[internal/release/7.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Oct 12, 2023
663a1f9
Merged PR 34387: [internal/release/7.0] Merge from public
vseanreesermsft Oct 13, 2023
e2ba90c
[internal/release/7.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Oct 17, 2023
466459f
[internal/release/7.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Oct 17, 2023
d4f96fa
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 18, 2023
ebddd08
Merged PR 34534: [internal/release/7.0] Update dependencies from dnce…
dotnet-bot Oct 19, 2023
a888aa5
[internal/release/7.0] Update dependencies from dnceng/internal/dotne…
dotnet-bot Oct 19, 2023
6326dc6
Merge in 'release/7.0' changes
dotnet-bot Oct 19, 2023
825db07
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 20, 2023
523c17f
Merged PR 34658: [internal/release/7.0] Update dependencies from dnce…
dotnet-bot Oct 20, 2023
c91ac8e
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 23, 2023
0a71569
Merged PR 34741: [internal/release/7.0] Update dependencies from dnce…
dotnet-bot Oct 23, 2023
72000de
Merge commit '0a715692d8e2536c899faa0bb4f0cec2c2e33e36' into internal…
vseanreesermsft Nov 14, 2023
8d157a1
Update baseline, SDK
wtgodbe Nov 14, 2023
4f873f6
Pass dotnetEfVersion in Helix test runner
wtgodbe Nov 15, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
@@ -4,8 +4,10 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-31662b3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-31662b30/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-808851b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-808851b0/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -24,8 +26,10 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-31662b3" value="true" />
<!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-808851b" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
428 changes: 214 additions & 214 deletions eng/Baseline.Designer.props

Large diffs are not rendered by default.

208 changes: 104 additions & 104 deletions eng/Baseline.xml

Large diffs are not rendered by default.

64 changes: 32 additions & 32 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -9,37 +9,37 @@
-->
<Dependencies>
<ProductDependencies>
<Dependency Name="dotnet-ef" Version="7.0.12">
<Dependency Name="dotnet-ef" Version="7.0.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>c20ecc79b7df3657e186ac52e7fc050beea36c92</Sha>
<Sha>31662b30f1a4497db482b3aed8ed4c4aa6de801b</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.12">
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>c20ecc79b7df3657e186ac52e7fc050beea36c92</Sha>
<Sha>31662b30f1a4497db482b3aed8ed4c4aa6de801b</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="7.0.12">
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="7.0.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>c20ecc79b7df3657e186ac52e7fc050beea36c92</Sha>
<Sha>31662b30f1a4497db482b3aed8ed4c4aa6de801b</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.12">
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>c20ecc79b7df3657e186ac52e7fc050beea36c92</Sha>
<Sha>31662b30f1a4497db482b3aed8ed4c4aa6de801b</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.12">
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>c20ecc79b7df3657e186ac52e7fc050beea36c92</Sha>
<Sha>31662b30f1a4497db482b3aed8ed4c4aa6de801b</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="7.0.12">
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="7.0.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>c20ecc79b7df3657e186ac52e7fc050beea36c92</Sha>
<Sha>31662b30f1a4497db482b3aed8ed4c4aa6de801b</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="7.0.12">
<Dependency Name="Microsoft.EntityFrameworkCore" Version="7.0.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>c20ecc79b7df3657e186ac52e7fc050beea36c92</Sha>
<Sha>31662b30f1a4497db482b3aed8ed4c4aa6de801b</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="7.0.12">
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="7.0.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>c20ecc79b7df3657e186ac52e7fc050beea36c92</Sha>
<Sha>31662b30f1a4497db482b3aed8ed4c4aa6de801b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -177,9 +177,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
</Dependency>
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="7.0.12-servicing.23477.20">
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="7.0.14-servicing.23519.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>4a824ef37caa51072221584c64cbf15455f406ca</Sha>
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.22505.1">
<Uri>https://github.com/dotnet/source-build-externals</Uri>
@@ -242,9 +242,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="7.0.3">
<Dependency Name="System.Text.Json" Version="7.0.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</Sha>
</Dependency>
<Dependency Name="System.Threading.AccessControl" Version="7.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -262,33 +262,33 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.12">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>4a824ef37caa51072221584c64cbf15455f406ca</Sha>
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="7.0.12">
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="7.0.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>4a824ef37caa51072221584c64cbf15455f406ca</Sha>
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="7.0.12">
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="7.0.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>4a824ef37caa51072221584c64cbf15455f406ca</Sha>
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</Sha>
</Dependency>
<!--
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
All Runtime.$rid packages should have the same version.
-->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.12">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>4a824ef37caa51072221584c64cbf15455f406ca</Sha>
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="7.0.12">
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="7.0.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>4a824ef37caa51072221584c64cbf15455f406ca</Sha>
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="7.0.12-servicing.23477.20">
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="7.0.14-servicing.23519.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>4a824ef37caa51072221584c64cbf15455f406ca</Sha>
<Sha>808851b07acfa1c5c94b0d4f9fb50debedb2df70</Sha>
</Dependency>
<Dependency Name="Microsoft.Web.Xdt" Version="7.0.0-preview.22423.2">
<Uri>https://github.com/dotnet/xdt</Uri>
36 changes: 18 additions & 18 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
<AspNetCoreMajorVersion>7</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>15</AspNetCorePatchVersion>
<ValidateBaseline>false</ValidateBaseline>
<ValidateBaseline>true</ValidateBaseline>
<!--
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
-->
@@ -63,12 +63,12 @@
<PropertyGroup Label="Automated">
<!-- Packages from dotnet/runtime -->
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCoreAppRefVersion>7.0.12</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.12</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>7.0.12</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>7.0.12</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>7.0.12</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>7.0.12-servicing.23477.20</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftNETCoreAppRefVersion>7.0.14</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.14</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>7.0.14</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>7.0.14</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>7.0.14</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>7.0.14-servicing.23519.10</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>7.0.0</MicrosoftExtensionsCachingAbstractionsVersion>
<MicrosoftExtensionsCachingMemoryVersion>7.0.0</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>7.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
@@ -103,7 +103,7 @@
<MicrosoftExtensionsOptionsDataAnnotationsVersion>7.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>7.0.1</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>7.0.0</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.12-servicing.23477.20</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.14-servicing.23519.10</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<SystemConfigurationConfigurationManagerVersion>7.0.0</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsDiagnosticSourceVersion>7.0.2</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>7.0.0</SystemDiagnosticsEventLogVersion>
@@ -118,21 +118,21 @@
<SystemSecurityPermissionsVersion>7.0.0</SystemSecurityPermissionsVersion>
<SystemServiceProcessServiceControllerVersion>7.0.1</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingsWebVersion>7.0.0</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>7.0.3</SystemTextJsonVersion>
<SystemTextJsonVersion>7.0.4</SystemTextJsonVersion>
<SystemThreadingAccessControlVersion>7.0.1</SystemThreadingAccessControlVersion>
<SystemThreadingChannelsVersion>7.0.0</SystemThreadingChannelsVersion>
<SystemThreadingRateLimitingVersion>7.0.1</SystemThreadingRateLimitingVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsVersion>7.0.4</MicrosoftNETCorePlatformsVersion>
<!-- Packages from dotnet/efcore -->
<dotnetefVersion>7.0.12</dotnetefVersion>
<MicrosoftEntityFrameworkCoreInMemoryVersion>7.0.12</MicrosoftEntityFrameworkCoreInMemoryVersion>
<MicrosoftEntityFrameworkCoreRelationalVersion>7.0.12</MicrosoftEntityFrameworkCoreRelationalVersion>
<MicrosoftEntityFrameworkCoreSqliteVersion>7.0.12</MicrosoftEntityFrameworkCoreSqliteVersion>
<MicrosoftEntityFrameworkCoreSqlServerVersion>7.0.12</MicrosoftEntityFrameworkCoreSqlServerVersion>
<MicrosoftEntityFrameworkCoreToolsVersion>7.0.12</MicrosoftEntityFrameworkCoreToolsVersion>
<MicrosoftEntityFrameworkCoreVersion>7.0.12</MicrosoftEntityFrameworkCoreVersion>
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.12</MicrosoftEntityFrameworkCoreDesignVersion>
<dotnetefVersion>7.0.14</dotnetefVersion>
<MicrosoftEntityFrameworkCoreInMemoryVersion>7.0.14</MicrosoftEntityFrameworkCoreInMemoryVersion>
<MicrosoftEntityFrameworkCoreRelationalVersion>7.0.14</MicrosoftEntityFrameworkCoreRelationalVersion>
<MicrosoftEntityFrameworkCoreSqliteVersion>7.0.14</MicrosoftEntityFrameworkCoreSqliteVersion>
<MicrosoftEntityFrameworkCoreSqlServerVersion>7.0.14</MicrosoftEntityFrameworkCoreSqlServerVersion>
<MicrosoftEntityFrameworkCoreToolsVersion>7.0.14</MicrosoftEntityFrameworkCoreToolsVersion>
<MicrosoftEntityFrameworkCoreVersion>7.0.14</MicrosoftEntityFrameworkCoreVersion>
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.14</MicrosoftEntityFrameworkCoreDesignVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23556.6</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23556.6</MicrosoftDotNetBuildTasksTemplatingVersion>
@@ -238,7 +238,7 @@
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>5.0.17-servicing-22215-7</MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>6.0.22-servicing-23424-15</MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>6.0.25-servicing-23523-15</MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension60x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension60x64Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension60x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension60x86Version>
<!-- 3rd party dependencies -->
5 changes: 3 additions & 2 deletions eng/helix/content/runtests.cmd
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@ set $arch=%4
set $quarantined=%5
set $helixTimeout=%6
set $installPlaywright=%7
set $dotnetEfVersion=%8
REM Batch only supports up to 9 arguments using the %# syntax, need to shift to get more

set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
@@ -24,8 +25,8 @@ echo.

set exit_code=0

echo "Running tests: dotnet %HELIX_CORRELATION_PAYLOAD%/HelixTestRunner/HelixTestRunner.dll --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --helixTimeout %$helixTimeout% --playwright %$installPlaywright%"
dotnet %HELIX_CORRELATION_PAYLOAD%/HelixTestRunner/HelixTestRunner.dll --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --helixTimeout %$helixTimeout% --playwright %$installPlaywright%
echo "Running tests: dotnet %HELIX_CORRELATION_PAYLOAD%/HelixTestRunner/HelixTestRunner.dll --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --helixTimeout %$helixTimeout% --playwright %$installPlaywright% --dotnetEf %$dotnetEfVersion%"
dotnet %HELIX_CORRELATION_PAYLOAD%/HelixTestRunner/HelixTestRunner.dll --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --helixTimeout %$helixTimeout% --playwright %$installPlaywright% --dotnetEf %$dotnetEfVersion%
if not errorlevel 0 (
set exit_code=%errorlevel%
)
4 changes: 2 additions & 2 deletions eng/helix/content/runtests.sh
Original file line number Diff line number Diff line change
@@ -78,8 +78,8 @@ sync

exit_code=0

echo "Running tests: dotnet $HELIX_CORRELATION_PAYLOAD/HelixTestRunner/HelixTestRunner.dll --target $1 --runtime $2 --queue $helixQueue --arch $4 --quarantined $5 --helixTimeout $6 --playwright $installPlaywright"
dotnet $HELIX_CORRELATION_PAYLOAD/HelixTestRunner/HelixTestRunner.dll --target $1 --runtime $2 --queue $helixQueue --arch $4 --quarantined $5 --helixTimeout $6 --playwright $installPlaywright
echo "Running tests: dotnet $HELIX_CORRELATION_PAYLOAD/HelixTestRunner/HelixTestRunner.dll --target $1 --runtime $2 --queue $helixQueue --arch $4 --quarantined $5 --helixTimeout $6 --playwright $installPlaywright --dotnetEf $8"
dotnet $HELIX_CORRELATION_PAYLOAD/HelixTestRunner/HelixTestRunner.dll --target $1 --runtime $2 --queue $helixQueue --arch $4 --quarantined $5 --helixTimeout $6 --playwright $installPlaywright --dotnetEf $8
exit_code=$?
echo "Finished tests...exit_code=$exit_code"

4 changes: 2 additions & 2 deletions eng/targets/Helix.targets
Original file line number Diff line number Diff line change
@@ -221,8 +221,8 @@
When the targeting pack builds, it has exactly the same version as the shared framework. Passing
SharedFxVersion because that's needed even when the targeting pack isn't building.
-->
<Command Condition="$(IsWindowsHelixQueue)">call runtests.cmd $(TargetFileName) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(_TestingArchitecture) $(RunQuarantinedTests) $(HelixTimeout) $(TestDependsOnPlaywright)</Command>
<Command Condition="!$(IsWindowsHelixQueue)">./runtests.sh $(TargetFileName) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(_TestingArchitecture) $(RunQuarantinedTests) $(HelixTimeout) $(TestDependsOnPlaywright)</Command>
<Command Condition="$(IsWindowsHelixQueue)">call runtests.cmd $(TargetFileName) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(_TestingArchitecture) $(RunQuarantinedTests) $(HelixTimeout) $(TestDependsOnPlaywright) $(DotnetEfVersion)</Command>
<Command Condition="!$(IsWindowsHelixQueue)">./runtests.sh $(TargetFileName) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(_TestingArchitecture) $(RunQuarantinedTests) $(HelixTimeout) $(TestDependsOnPlaywright) $(DotnetEfVersion)</Command>
<Command Condition="'$(HelixCommand)' != ''">$(HelixCommand)</Command>
<Timeout>$(HelixTimeout)</Timeout>
</HelixWorkItem>
Loading