Skip to content

Commit 0090fb1

Browse files
authored
Merge branch 'main' into merge/release/10.0-to-main
2 parents 3426320 + aedc6f6 commit 0090fb1

File tree

208 files changed

+11473
-8732
lines changed

Some content is hidden

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

208 files changed

+11473
-8732
lines changed

Directory.Packages.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
5555
<PackageVersion Include="mod_spatialite" Version="4.3.0.1" />
5656
<PackageVersion Include="SQLitePCLRaw.core" Version="$(SQLitePCLRawVersion)" />
57-
<PackageVersion Include="SQLitePCLRaw.bundle_sqlite3" Version="$(SQLitePCLRawVersion)" />
5857
<PackageVersion Include="SQLitePCLRaw.bundle_e_sqlite3" Version="$(SQLitePCLRawVersion)" />
5958
</ItemGroup>
6059
</Project>

EFCore.sln

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Sqlite.Benchmarks",
112112
EndProject
113113
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Benchmarks", "benchmark\EFCore.Benchmarks\EFCore.Benchmarks.csproj", "{2642F4F0-69BE-4C43-94B7-B298FEC87D89}"
114114
EndProject
115-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.Sqlite.e_sqlcipher.Tests", "test\Microsoft.Data.Sqlite.Tests\Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj", "{7B598E0C-B8E2-4F1F-B53C-ED84178E65BE}"
116-
EndProject
117-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.Sqlite.e_sqlite3mc.Tests", "test\Microsoft.Data.Sqlite.Tests\Microsoft.Data.Sqlite.e_sqlite3mc.Tests.csproj", "{203F3577-9E24-4714-AD31-F119B26FA8C1}"
118-
EndProject
119115
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.Sqlite.winsqlite3.Tests", "test\Microsoft.Data.Sqlite.Tests\Microsoft.Data.Sqlite.winsqlite3.Tests.csproj", "{B163761D-FB4A-4C80-BAB9-01905E1351EF}"
120116
EndProject
121117
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.Sqlite.sqlite3.Tests", "test\Microsoft.Data.Sqlite.Tests\Microsoft.Data.Sqlite.sqlite3.Tests.csproj", "{E0FF35C8-8038-4394-9C2A-AF34BE3CC61F}"
@@ -314,14 +310,6 @@ Global
314310
{2642F4F0-69BE-4C43-94B7-B298FEC87D89}.Debug|Any CPU.Build.0 = Debug|Any CPU
315311
{2642F4F0-69BE-4C43-94B7-B298FEC87D89}.Release|Any CPU.ActiveCfg = Release|Any CPU
316312
{2642F4F0-69BE-4C43-94B7-B298FEC87D89}.Release|Any CPU.Build.0 = Release|Any CPU
317-
{7B598E0C-B8E2-4F1F-B53C-ED84178E65BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
318-
{7B598E0C-B8E2-4F1F-B53C-ED84178E65BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
319-
{7B598E0C-B8E2-4F1F-B53C-ED84178E65BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
320-
{7B598E0C-B8E2-4F1F-B53C-ED84178E65BE}.Release|Any CPU.Build.0 = Release|Any CPU
321-
{203F3577-9E24-4714-AD31-F119B26FA8C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
322-
{203F3577-9E24-4714-AD31-F119B26FA8C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
323-
{203F3577-9E24-4714-AD31-F119B26FA8C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
324-
{203F3577-9E24-4714-AD31-F119B26FA8C1}.Release|Any CPU.Build.0 = Release|Any CPU
325313
{B163761D-FB4A-4C80-BAB9-01905E1351EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
326314
{B163761D-FB4A-4C80-BAB9-01905E1351EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
327315
{B163761D-FB4A-4C80-BAB9-01905E1351EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -427,8 +415,6 @@ Global
427415
{24D7B6D5-A22A-4734-BB55-F464C112F891} = {293B4F79-3CB9-402A-A74C-B8108C41A7CF}
428416
{5A44F67E-517F-458D-B9C7-12A4DBBAD64A} = {293B4F79-3CB9-402A-A74C-B8108C41A7CF}
429417
{2642F4F0-69BE-4C43-94B7-B298FEC87D89} = {293B4F79-3CB9-402A-A74C-B8108C41A7CF}
430-
{7B598E0C-B8E2-4F1F-B53C-ED84178E65BE} = {258D5057-81B9-40EC-A872-D21E27452749}
431-
{203F3577-9E24-4714-AD31-F119B26FA8C1} = {258D5057-81B9-40EC-A872-D21E27452749}
432418
{B163761D-FB4A-4C80-BAB9-01905E1351EF} = {258D5057-81B9-40EC-A872-D21E27452749}
433419
{E0FF35C8-8038-4394-9C2A-AF34BE3CC61F} = {258D5057-81B9-40EC-A872-D21E27452749}
434420
{7C0E5443-FE44-4436-8A7D-CE64D1F889BD} = {258D5057-81B9-40EC-A872-D21E27452749}

NuGet.config

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-dotnet -->
7-
<add key="darc-pub-dotnet-dotnet-ba86126" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-ba861262/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-dotnet -->
98
<!-- Begin: Package sources from dotnet-runtime -->
109
<!-- End: Package sources from dotnet-runtime -->
@@ -17,12 +16,10 @@
1716
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
1817
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
1918
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
19+
<add key="dotnet11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11/nuget/v3/index.json" />
20+
<add key="dotnet11-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11-transport/nuget/v3/index.json" />
2021
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
2122
</packageSources>
22-
<auditSources>
23-
<clear />
24-
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
25-
</auditSources>
2623
<disabledPackageSources>
2724
<clear />
2825
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->

azure-pipelines-internal-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ extends:
137137
- job: macOS
138138
pool:
139139
name: Azure Pipelines
140-
image: macOS-13
140+
image: macOS-15
141141
os: macOS
142142
variables:
143143
# Rely on task Arcade injects, not auto-injected build step.
@@ -208,7 +208,7 @@ extends:
208208
- name: _HelixBuildConfig
209209
value: $(_BuildConfig)
210210
- name: HelixTargetQueues
211-
value: Windows.10.Amd64;OSX.13.Amd64;OSX.13.ARM64;[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-sqlserver-amd64
211+
value: Windows.10.Amd64;OSX.15.Amd64;OSX.15.ARM64;[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-sqlserver-amd64
212212
- name: _HelixAccessToken
213213
# Needed for internal queues
214214
value: $(HelixApiAccessToken)

azure-pipelines-public.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ stages:
9494
- job: macOS
9595
enablePublishTestResults: true
9696
pool:
97-
vmImage: macOS-13
97+
vmImage: macOS-15
9898
variables:
9999
# Rely on task Arcade injects, not auto-injected build step.
100100
- skipComponentGovernanceDetection: true
@@ -152,7 +152,7 @@ stages:
152152
- name: _HelixBuildConfig
153153
value: $(_BuildConfig)
154154
- name: HelixTargetQueues
155-
value: Windows.10.Amd64.Open;OSX.13.Amd64.Open;[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-sqlserver-amd64
155+
value: Windows.10.Amd64.Open;OSX.15.Amd64.Open;[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-sqlserver-amd64
156156
- name: _HelixAccessToken
157157
value: '' # Needed for public queues
158158
steps:

eng/Version.Details.props

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetHelixSdkPackageVersion>
12-
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0</MicrosoftExtensionsCachingMemoryPackageVersion>
13-
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0</MicrosoftExtensionsConfigurationPackageVersion>
14-
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
15-
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
16-
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0</MicrosoftExtensionsConfigurationJsonPackageVersion>
17-
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0</MicrosoftExtensionsDependencyInjectionPackageVersion>
18-
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
19-
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rtm.25531.102</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
20-
<MicrosoftExtensionsLoggingPackageVersion>10.0.0</MicrosoftExtensionsLoggingPackageVersion>
21-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0</MicrosoftNETCoreAppRefPackageVersion>
22-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25531.102</MicrosoftNETCorePlatformsPackageVersion>
23-
<SystemFormatsAsn1PackageVersion>10.0.0</SystemFormatsAsn1PackageVersion>
24-
<SystemRuntimeCachingPackageVersion>10.0.0</SystemRuntimeCachingPackageVersion>
25-
<SystemTextEncodingsWebPackageVersion>10.0.0</SystemTextEncodingsWebPackageVersion>
26-
<SystemTextJsonPackageVersion>10.0.0</SystemTextJsonPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25531.101</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25531.101</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25531.101</MicrosoftDotNetHelixSdkPackageVersion>
12+
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.1.25531.101</MicrosoftExtensionsCachingMemoryPackageVersion>
13+
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.1.25531.101</MicrosoftExtensionsConfigurationPackageVersion>
14+
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.1.25531.101</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
15+
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.1.25531.101</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
16+
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.1.25531.101</MicrosoftExtensionsConfigurationJsonPackageVersion>
17+
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.1.25531.101</MicrosoftExtensionsDependencyInjectionPackageVersion>
18+
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.1.25531.101</MicrosoftExtensionsDependencyModelPackageVersion>
19+
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.1.25531.101</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
20+
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.1.25531.101</MicrosoftExtensionsLoggingPackageVersion>
21+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25531.101</MicrosoftNETCoreAppRefPackageVersion>
22+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25531.101</MicrosoftNETCorePlatformsPackageVersion>
23+
<SystemFormatsAsn1PackageVersion>10.0.0-rc.1.25531.101</SystemFormatsAsn1PackageVersion>
24+
<SystemRuntimeCachingPackageVersion>10.0.0-rc.1.25531.101</SystemRuntimeCachingPackageVersion>
25+
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.1.25531.101</SystemTextEncodingsWebPackageVersion>
26+
<SystemTextJsonPackageVersion>10.0.0-rc.1.25531.101</SystemTextJsonPackageVersion>
2727
</PropertyGroup>
2828
<!--Property group for alternate package version names-->
2929
<PropertyGroup>

eng/Version.Details.xml

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="ba86126261026d26f7c30cd3434680d3965a88cf" BarId="289152" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="6ad4d0db4a7569ab9944901096381c5eff133709" BarId="289141" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0">
5+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.1.25531.101">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
7+
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0">
9+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.1.25531.101">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
11+
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0">
13+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.1.25531.101">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
15+
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0">
17+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.1.25531.101">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
19+
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0">
21+
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.1.25531.101">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
23+
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0">
25+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.1.25531.101">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
27+
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0">
29+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.1.25531.101">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
31+
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rtm.25531.102">
33+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.1.25531.101">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
35+
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0">
37+
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.1.25531.101">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
39+
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0">
41+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25531.101">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
43+
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rtm.25531.102">
45+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25531.101">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
47+
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Text.Json" Version="10.0.0">
49+
<Dependency Name="System.Text.Json" Version="10.0.0-rc.1.25531.101">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
51+
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
5252
</Dependency>
53-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0">
53+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.1.25531.101">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
55+
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Asn1" Version="10.0.0">
57+
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.1.25531.101">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
59+
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
6060
</Dependency>
61-
<Dependency Name="System.Runtime.Caching" Version="10.0.0">
61+
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.1.25531.101">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
63+
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
6464
</Dependency>
6565
</ProductDependencies>
6666
<ToolsetDependencies>
67-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25531.102">
67+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25531.101">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
69+
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25531.102">
71+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25531.101">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
73+
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
7474
</Dependency>
75-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25531.102">
75+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25531.101">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
77+
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
7878
</Dependency>
7979
</ToolsetDependencies>
8080
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@
3939
<AzureIdentityVersion>1.14.2</AzureIdentityVersion>
4040
<AzureResourceManagerCosmosDBVersion>1.3.2</AzureResourceManagerCosmosDBVersion>
4141
<OpenTelemetryExporterInMemoryVersion>1.12.0</OpenTelemetryExporterInMemoryVersion>
42-
<SQLitePCLRawVersion>2.1.11</SQLitePCLRawVersion>
42+
<SQLitePCLRawVersion>3.0.2</SQLitePCLRawVersion>
4343
</PropertyGroup>
4444
</Project>

eng/common/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ runtime_source_feed=''
9292
runtime_source_feed_key=''
9393

9494
properties=()
95-
while [[ $# > 0 ]]; do
95+
while [[ $# -gt 0 ]]; do
9696
opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
9797
case "$opt" in
9898
-help|-h)

eng/common/core-templates/job/job.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ parameters:
1919
# publishing defaults
2020
artifacts: ''
2121
enableMicrobuild: false
22+
enablePreviewMicrobuild: false
23+
microbuildPluginVersion: 'latest'
2224
enableMicrobuildForMacAndLinux: false
2325
microbuildUseESRP: true
2426
enablePublishBuildArtifacts: false
@@ -128,6 +130,8 @@ jobs:
128130
- template: /eng/common/core-templates/steps/install-microbuild.yml
129131
parameters:
130132
enableMicrobuild: ${{ parameters.enableMicrobuild }}
133+
enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
134+
microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }}
131135
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
132136
microbuildUseESRP: ${{ parameters.microbuildUseESRP }}
133137
continueOnError: ${{ parameters.continueOnError }}
@@ -153,6 +157,8 @@ jobs:
153157
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
154158
parameters:
155159
enableMicrobuild: ${{ parameters.enableMicrobuild }}
160+
enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
161+
microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }}
156162
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
157163
continueOnError: ${{ parameters.continueOnError }}
158164

0 commit comments

Comments
 (0)