Skip to content

Commit 62316a9

Browse files
AndriySvyrydAndriySvyryd
authored
Merge release/9.0 to release/9.0-staging (#37331)
2 parents 00b6a64 + 0e1e0e7 commit 62316a9

File tree

30 files changed

+295
-84
lines changed

30 files changed

+295
-84
lines changed

‎Directory.Build.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@
5555
<NoWarn>$(NoWarn.Replace(';1591', ''))</NoWarn>
5656
</PropertyGroup>
5757

58+
<PropertyGroup>
59+
<NuGetAuditLevel>moderate</NuGetAuditLevel>
60+
</PropertyGroup>
61+
5862
<ItemGroup>
5963
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" />
6064
</ItemGroup>

‎azure-pipelines.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ extends:
4747
parameters:
4848
featureFlags:
4949
autoBaseline: false
50+
usePrefastVersion3: true
5051
autoEnableRoslynWithNewRuleset: false
52+
binskimScanAllExtensions: true
5153
sdl:
5254
sourceAnalysisPool:
5355
name: $(DncEngInternalBuildPool)
@@ -57,6 +59,8 @@ extends:
5759
baselineFile: $(Build.SourcesDirectory)\.config\guardian\.gdnbaselines
5860
binskim:
5961
scanOutputDirectoryOnly: true
62+
analyzeTargetGlob: +:f|**/Microsoft.EntityFrameworkCore*.dll;+:f|**/Microsoft.Data.Sqlite*.dll;+:f|**/ef.exe;+:f|**/dotnet-ef.exe;-:f|**/shims/**/*.exe;
63+
preReleaseVersion: '4.3.1'
6064
policheck:
6165
enabled: true
6266
tsa:
@@ -155,6 +159,9 @@ extends:
155159
COMPlus_EnableWriteXorExecute: 0
156160
displayName: Build
157161
templateContext:
162+
sdl:
163+
binskim:
164+
prereleaseVersion: ' '
158165
outputs:
159166
- output: pipelineArtifact
160167
displayName: Upload TestResults
@@ -177,6 +184,9 @@ extends:
177184
- script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine $(_InternalRuntimeDownloadArgs)
178185
displayName: Build
179186
templateContext:
187+
sdl:
188+
binskim:
189+
prereleaseVersion: ' '
180190
outputs:
181191
- output: pipelineArtifact
182192
displayName: Upload TestResults

‎benchmark/Directory.Build.props‎

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

44
<PropertyGroup>
55
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\rulesets\EFCore.test.ruleset</CodeAnalysisRuleSet>
6+
<NuGetAudit>false</NuGetAudit>
67
</PropertyGroup>
78

89
<ItemGroup>

‎benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
<ProjectReference Include="..\..\src\EFCore.Sqlite.Core\EFCore.Sqlite.Core.csproj" />
1717
</ItemGroup>
1818

19-
<ItemGroup>
20-
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" />
21-
</ItemGroup>
22-
2319
<ItemGroup>
2420
<None Update="AdventureWorks2014.db">
2521
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

‎eng/Version.Details.xml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,83 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.9">
4+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.11">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6-
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
6+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.9">
8+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.11">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
10-
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
10+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.9">
12+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.11">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
14-
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
14+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.9">
16+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.11">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
18-
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
18+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.9">
20+
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.11">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22-
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
22+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.9">
24+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.11">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
26-
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
26+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.9">
28+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.11">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
30-
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
30+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.9-servicing.25419.16">
32+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.11-servicing.25517.16">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
34-
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
34+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.9">
36+
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.11">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
38-
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
38+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.9">
40+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.11">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
42-
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
42+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
4343
</Dependency>
44-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="9.0.9-servicing.25419.16">
44+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="9.0.11-servicing.25517.16">
4545
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
46-
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
46+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
4747
</Dependency>
4848
<!--
4949
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
5050
All Runtime.$rid packages should have the same version.
5151
-->
52-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.9">
52+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.11">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
54-
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
54+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
5555
</Dependency>
56-
<Dependency Name="System.Text.Json" Version="9.0.9">
56+
<Dependency Name="System.Text.Json" Version="9.0.11">
5757
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
58-
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
58+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
5959
</Dependency>
60-
<Dependency Name="System.Text.Encodings.Web" Version="9.0.9">
60+
<Dependency Name="System.Text.Encodings.Web" Version="9.0.11">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
62-
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
62+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
6363
</Dependency>
64-
<Dependency Name="System.Formats.Asn1" Version="9.0.9">
64+
<Dependency Name="System.Formats.Asn1" Version="9.0.11">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>893c2ebbd49952ca49e93298148af2d95a61a0a4</Sha>
66+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
6767
</Dependency>
6868
</ProductDependencies>
6969
<ToolsetDependencies>
70-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25503.3">
70+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25577.5">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
72+
<Sha>0890ca08513391dafe556fb326c73c6c5c6cb329</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25503.3">
74+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25577.5">
7575
<Uri>https://github.com/dotnet/arcade</Uri>
76-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
76+
<Sha>0890ca08513391dafe556fb326c73c6c5c6cb329</Sha>
7777
</Dependency>
78-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25503.3">
78+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25577.5">
7979
<Uri>https://github.com/dotnet/arcade</Uri>
80-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
80+
<Sha>0890ca08513391dafe556fb326c73c6c5c6cb329</Sha>
8181
</Dependency>
8282
</ToolsetDependencies>
8383
</Dependencies>

‎eng/Versions.props‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup Label="Version settings">
3-
<VersionPrefix>9.0.11</VersionPrefix>
4-
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
3+
<VersionPrefix>9.0.12</VersionPrefix>
4+
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
55
<PreReleaseVersionIteration>
66
</PreReleaseVersionIteration>
77
<IncludeSourceRevisionInInformationalVersion>False</IncludeSourceRevisionInInformationalVersion>
@@ -17,24 +17,24 @@
1717
<UsingToolXliff>False</UsingToolXliff>
1818
</PropertyGroup>
1919
<PropertyGroup Label="Dependencies from dotnet/runtime">
20-
<MicrosoftExtensionsCachingMemoryVersion>9.0.9</MicrosoftExtensionsCachingMemoryVersion>
21-
<MicrosoftExtensionsConfigurationVersion>9.0.9</MicrosoftExtensionsConfigurationVersion>
22-
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.9</MicrosoftExtensionsConfigurationAbstractionsVersion>
23-
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.9</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
24-
<MicrosoftExtensionsConfigurationJsonVersion>9.0.9</MicrosoftExtensionsConfigurationJsonVersion>
25-
<MicrosoftExtensionsDependencyInjectionVersion>9.0.9</MicrosoftExtensionsDependencyInjectionVersion>
26-
<MicrosoftExtensionsDependencyModelVersion>9.0.9</MicrosoftExtensionsDependencyModelVersion>
27-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.9-servicing.25419.16</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
28-
<MicrosoftExtensionsLoggingVersion>9.0.9</MicrosoftExtensionsLoggingVersion>
29-
<MicrosoftNETCoreAppRefVersion>9.0.9</MicrosoftNETCoreAppRefVersion>
30-
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.9</MicrosoftNETCoreAppRuntimewinx64Version>
31-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>9.0.9-servicing.25419.16</MicrosoftNETCoreBrowserDebugHostTransportVersion>
32-
<SystemTextEncodingsWebVersion>9.0.9</SystemTextEncodingsWebVersion>
33-
<SystemTextJsonVersion>9.0.9</SystemTextJsonVersion>
34-
<SystemFormatsAsn1Version>9.0.9</SystemFormatsAsn1Version>
20+
<MicrosoftExtensionsCachingMemoryVersion>9.0.11</MicrosoftExtensionsCachingMemoryVersion>
21+
<MicrosoftExtensionsConfigurationVersion>9.0.11</MicrosoftExtensionsConfigurationVersion>
22+
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.11</MicrosoftExtensionsConfigurationAbstractionsVersion>
23+
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.11</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
24+
<MicrosoftExtensionsConfigurationJsonVersion>9.0.11</MicrosoftExtensionsConfigurationJsonVersion>
25+
<MicrosoftExtensionsDependencyInjectionVersion>9.0.11</MicrosoftExtensionsDependencyInjectionVersion>
26+
<MicrosoftExtensionsDependencyModelVersion>9.0.11</MicrosoftExtensionsDependencyModelVersion>
27+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.11-servicing.25517.16</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
28+
<MicrosoftExtensionsLoggingVersion>9.0.11</MicrosoftExtensionsLoggingVersion>
29+
<MicrosoftNETCoreAppRefVersion>9.0.11</MicrosoftNETCoreAppRefVersion>
30+
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.11</MicrosoftNETCoreAppRuntimewinx64Version>
31+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>9.0.11-servicing.25517.16</MicrosoftNETCoreBrowserDebugHostTransportVersion>
32+
<SystemTextEncodingsWebVersion>9.0.11</SystemTextEncodingsWebVersion>
33+
<SystemTextJsonVersion>9.0.11</SystemTextJsonVersion>
34+
<SystemFormatsAsn1Version>9.0.11</SystemFormatsAsn1Version>
3535
</PropertyGroup>
3636
<PropertyGroup Label="Dependencies from dotnet/arcade">
37-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25503.3</MicrosoftDotNetBuildTasksTemplatingVersion>
37+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25577.5</MicrosoftDotNetBuildTasksTemplatingVersion>
3838
</PropertyGroup>
3939
<PropertyGroup Label="Other dependencies">
4040
<MicrosoftBuildFrameworkVersion>17.8.43</MicrosoftBuildFrameworkVersion>

‎eng/common/core-templates/job/publish-build-assets.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,11 @@ jobs:
145145
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
146146
is1ESPipeline: ${{ parameters.is1ESPipeline }}
147147

148+
# Darc is targeting 8.0, so make sure it's installed
149+
- task: UseDotNet@2
150+
inputs:
151+
version: 8.0.x
152+
148153
- task: AzureCLI@2
149154
displayName: Publish Using Darc
150155
inputs:

‎eng/common/core-templates/job/source-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
demands: ImageOverride -equals build.ubuntu.2004.amd64
6666
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6767
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
68-
image: 1es-mariner-2
68+
image: 1es-azurelinux-3
6969
os: linux
7070
${{ else }}:
7171
pool:

‎eng/common/core-templates/post-build/post-build.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,11 @@ stages:
305305

306306
- task: NuGetAuthenticate@1
307307

308+
# Darc is targeting 8.0, so make sure it's installed
309+
- task: UseDotNet@2
310+
inputs:
311+
version: 8.0.x
312+
308313
- task: AzureCLI@2
309314
displayName: Publish Using Darc
310315
inputs:

‎eng/common/core-templates/steps/source-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ steps:
4141
# in the default public locations.
4242
internalRuntimeDownloadArgs=
4343
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
44-
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
44+
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
4545
fi
4646
4747
buildConfig=Release

0 commit comments

Comments
 (0)