Skip to content

Commit 97603e0

Browse files
committed
Update dependencies
Disable NuGetAudit in official build
1 parent 3ac9d0e commit 97603e0

File tree

22 files changed

+48
-40
lines changed

22 files changed

+48
-40
lines changed

azure-pipelines.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,12 @@ extends:
8282
os: windows
8383
timeoutInMinutes: 180
8484
variables:
85-
- _AdditionalBuildArgs: ''
8685
- _InternalBuildArgs: ''
8786
# Rely on task Arcade injects, not auto-injected build step.
8887
- skipComponentGovernanceDetection: true
8988
- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
9089
- _SignType: real
91-
- _InternalBuildArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
90+
- _InternalBuildArgs: /p:NuGetAudit=false /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
9291
# Ignore test and infrastructure code.
9392
- Codeql.SourceRoot: src
9493
# CodeQL3000 needs this plumbed along as a variable to enable TSA.
@@ -118,7 +117,7 @@ extends:
118117
env:
119118
Token: $(dn-bot-dnceng-artifact-feeds-rw)
120119
- template: /eng/common/templates-official/steps/enable-internal-runtimes.yml
121-
- script: eng\common\cibuild.cmd -configuration $(_BuildConfig) -prepareMachine $(_InternalBuildArgs) $(_InternalRuntimeDownloadArgs) $(_AdditionalBuildArgs)
120+
- script: eng\common\cibuild.cmd -configuration $(_BuildConfig) -prepareMachine $(_InternalBuildArgs) $(_InternalRuntimeDownloadArgs)
122121
env:
123122
Test__Cosmos__DefaultConnection: $(_CosmosConnectionUrl)
124123
displayName: Build
@@ -146,7 +145,7 @@ extends:
146145
env:
147146
Token: $(dn-bot-dnceng-artifact-feeds-rw)
148147
- template: /eng/common/templates-official/steps/enable-internal-runtimes.yml
149-
- script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine $(_InternalRuntimeDownloadArgs)
148+
- script: eng/common/cibuild.sh --configuration $(_BuildConfig) -p:NuGetAudit=false --prepareMachine $(_InternalRuntimeDownloadArgs)
150149
env:
151150
Test__Cosmos__DefaultConnection: $(_CosmosConnectionUrl)
152151
# Work-around for https://github.com/dotnet/runtime/issues/70758
@@ -188,7 +187,7 @@ extends:
188187
env:
189188
Token: $(dn-bot-dnceng-artifact-feeds-rw)
190189
- template: /eng/common/templates-official/steps/enable-internal-runtimes.yml
191-
- script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine $(_InternalRuntimeDownloadArgs)
190+
- script: eng/common/cibuild.sh --configuration $(_BuildConfig) -p:NuGetAudit=false --prepareMachine $(_InternalRuntimeDownloadArgs)
192191
displayName: Build
193192
templateContext:
194193
outputs:
@@ -239,7 +238,7 @@ extends:
239238
permissions: rl
240239
- script: restore.cmd -ci /p:configuration=$(_BuildConfig) $(_InternalRuntimeDownloadArgs)
241240
displayName: Restore packages
242-
- script: .dotnet\dotnet build eng\helix.proj /restore /t:Test /p:configuration=$(_BuildConfig) /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog $(_InternalRuntimeDownloadArgs)
241+
- script: .dotnet\dotnet build eng\helix.proj /restore /t:Test /p:configuration=$(_BuildConfig) /p:NuGetAudit=false /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog $(_InternalRuntimeDownloadArgs)
243242
displayName: Send job to helix
244243
env:
245244
HelixAccessToken: $(_HelixAccessToken)

benchmark/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
9+
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
1010
<PackageReference Include="xunit.assert" Version="$(XunitVersion)" />
1111
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonVersion)" />
1212
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesVersion)" />

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

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

18-
<ItemGroup>
19-
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.6" />
20-
</ItemGroup>
21-
2218
<ItemGroup>
2319
<None Update="AdventureWorks2014.db">
2420
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
<PropertyGroup Label="Other dependencies">
3939
<!-- NB: This version affects Visual Studio compatibility. See https://learn.microsoft.com/visualstudio/extensibility/roslyn-version-support -->
4040
<MicrosoftCodeAnalysisVersion>4.5.0</MicrosoftCodeAnalysisVersion>
41-
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.24121.1</MicrosoftCodeAnalysisTestingVersion>
42-
<AzureIdentityVersion>1.11.3</AzureIdentityVersion>
41+
<MicrosoftCodeAnalysisTestingVersion>1.1.2</MicrosoftCodeAnalysisTestingVersion>
42+
<AzureIdentityVersion>1.17.0</AzureIdentityVersion>
4343
<AzureResourceManagerCosmosDBVersion>1.3.2</AzureResourceManagerCosmosDBVersion>
4444
</PropertyGroup>
4545
</Project>

src/EFCore.Cosmos/EFCore.Cosmos.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</ItemGroup>
4646

4747
<ItemGroup>
48-
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.35.4" />
48+
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.37.1" />
4949
<PackageReference Include="System.Net.Http" Version="4.3.4" />
5050
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
5151
</ItemGroup>

src/EFCore.Proxies/EFCore.Proxies.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</ItemGroup>
4040

4141
<ItemGroup>
42-
<PackageReference Include="Castle.Core" Version="5.1.1" />
42+
<PackageReference Include="Castle.Core" Version="5.2.1" />
4343
</ItemGroup>
4444

4545
<ItemGroup>

src/EFCore.Proxies/Proxies/Internal/LazyLoadingInterceptor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public virtual void Intercept(IInvocation invocation)
5353
}
5454
else if (LazyLoaderSetter.Equals(invocation.Method))
5555
{
56-
_loader = (ILazyLoader)invocation.Arguments[0];
56+
_loader = (ILazyLoader)invocation.Arguments[0]!;
5757
}
5858
else
5959
{

src/EFCore.Proxies/Proxies/Internal/PropertyChangeInterceptorBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ protected virtual string FindPropertyName(IInvocation invocation)
6060
if (indexerPropertyInfo != null
6161
&& indexerPropertyInfo.GetSetMethod(nonPublic: true) == invocation.Method)
6262
{
63-
return (string)invocation.Arguments[0];
63+
return (string)invocation.Arguments[0]!;
6464
}
6565
}
6666

src/EFCore.Proxies/Proxies/Internal/PropertyChangedInterceptor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ public virtual void Intercept(IInvocation invocation)
5050
if (methodName == $"add_{nameof(INotifyPropertyChanged.PropertyChanged)}")
5151
{
5252
_handler = (PropertyChangedEventHandler)Delegate.Combine(
53-
_handler, (Delegate)invocation.Arguments[0]);
53+
_handler, (Delegate)invocation.Arguments[0]!);
5454
}
5555
else if (methodName == $"remove_{nameof(INotifyPropertyChanged.PropertyChanged)}")
5656
{
5757
_handler = (PropertyChangedEventHandler?)Delegate.Remove(
58-
_handler, (Delegate)invocation.Arguments[0]);
58+
_handler, (Delegate)invocation.Arguments[0]!);
5959
}
6060
}
6161
else if (methodName.StartsWith("set_", StringComparison.Ordinal))

src/EFCore.Proxies/Proxies/Internal/PropertyChangingInterceptor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ public virtual void Intercept(IInvocation invocation)
5050
if (methodName == $"add_{nameof(INotifyPropertyChanging.PropertyChanging)}")
5151
{
5252
_handler = (PropertyChangingEventHandler)Delegate.Combine(
53-
_handler, (Delegate)invocation.Arguments[0]);
53+
_handler, (Delegate)invocation.Arguments[0]!);
5454
}
5555
else if (methodName == $"remove_{nameof(INotifyPropertyChanging.PropertyChanging)}")
5656
{
5757
_handler = (PropertyChangingEventHandler?)Delegate.Remove(
58-
_handler, (Delegate)invocation.Arguments[0]);
58+
_handler, (Delegate)invocation.Arguments[0]!);
5959
}
6060
}
6161
else if (methodName.StartsWith("set_", StringComparison.Ordinal))

0 commit comments

Comments
 (0)