Skip to content

Commit 7f7723b

Browse files
authored
Consume dependencies updates automatically via darc (#6676)
This refactors the list of dependency versions to support consuming updates automatically via darc and maestro.
1 parent 3d5deb1 commit 7f7723b

File tree

22 files changed

+593
-467
lines changed

22 files changed

+593
-467
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@ BenchmarkDotNet.Artifacts/
3131
korebuild-lock.txt
3232
.gradle/
3333
src/SignalR/clients/**/dist/
34+
modules/

Directory.Build.targets

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@
6161
<IsPackable Condition="'$(IsPackable)' == '' AND '$(IsImplementationProject)' == 'true' ">true</IsPackable>
6262
<IsPackable Condition="'$(IsPackable)' == '' ">false</IsPackable>
6363

64-
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreApp30PackageVersion)</RuntimeFrameworkVersion>
65-
<NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
64+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
6665
</PropertyGroup>
6766

6867
<Import Project="eng\targets\ResolveIisReferences.targets" Condition=" '$(MSBuildProjectExtension)' != '.vcxproj' " />

build/dependencies.folderbuilds.props

Lines changed: 0 additions & 7 deletions
This file was deleted.

build/dependencies.props

Lines changed: 0 additions & 226 deletions
This file was deleted.

build/external-dependencies.props

Lines changed: 5 additions & 159 deletions
Large diffs are not rendered by default.

build/repo.targets

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@
9797
<!-- We need to pass the NETCoreApp package versions to msbuild so that it doesn't complain about us using a different one than it was restored against. -->
9898
<PropertyGroup>
9999
<DesignTimeBuildProps>$(BuildProperties);MicrosoftNETCoreAppPackageVersion=$(MicrosoftNETCoreAppPackageVersion);</DesignTimeBuildProps>
100-
<DesignTimeBuildProps>$(DesignTimeBuildProps);MicrosoftNETCoreApp30PackageVersion=$(MicrosoftNETCoreApp30PackageVersion);</DesignTimeBuildProps>
101100
</PropertyGroup>
102101

103102
<ItemGroup>
@@ -210,13 +209,9 @@
210209
Packages="@(_LineupPackages)"
211210
OutputPath="$(GeneratedPackageVersionPropsPath)" />
212211

213-
<Copy SourceFiles="$(GeneratedPackageVersionPropsPath)" DestinationFolder="$(ArtifactsDir)" />
214-
215212
<RepoTasks.GenerateRestoreSourcesPropsFile
216213
Sources="@(_RestoreSources)"
217214
OutputPath="$(GeneratedRestoreSourcesPropsPath)" />
218-
219-
<Copy SourceFiles="$(GeneratedPackageVersionPropsPath);$(GeneratedBrandingPropsPath)" DestinationFolder="$(ArtifactsDir)" />
220215
</Target>
221216

222217
<Target Name="CleanRepoArtifacts">

build/tasks/RepoTasks.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<ItemGroup>
1111
<PackageReference Remove="Internal.AspNetCore.Sdk" />
1212
<PackageReference Include="NuGet.Build.Tasks" Version="4.9.1" />
13-
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(DevDependency_MicrosoftExtensionsDependencyModelPackageVersion)" />
14-
<PackageReference Include="WindowsAzure.Storage" Version="$(DevDependency_WindowsAzureStoragePackageVersion)" />
13+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
14+
<PackageReference Include="WindowsAzure.Storage" Version="8.7.0" />
1515
</ItemGroup>
1616

1717
<ItemGroup Condition="'$(BuildWindowsInstallers)' == 'true'">

eng/Dependencies.props

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ and are generated based on the last package release.
103103
<LatestPackageReference Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" />
104104
<LatestPackageReference Include="System.Memory" Version="$(SystemMemoryPackageVersion)" />
105105
<LatestPackageReference Include="System.Net.Http.WinHttpHandler" Version="$(SystemNetHttpWinHttpHandlerPackageVersion)" />
106-
<LatestPackageReference Include="System.Net.Http.WinHttpHandler" Version="$(SystemNetHttpWinHttpHandlerPackageVersion)" />
107106
<LatestPackageReference Include="System.Net.WebSockets.WebSocketProtocol" Version="$(SystemNetWebSocketsWebSocketProtocolPackageVersion)" />
108107
<LatestPackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsPackageVersion)" />
109108
<LatestPackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataPackageVersion)" />
@@ -115,37 +114,32 @@ and are generated based on the last package release.
115114
<LatestPackageReference Include="System.Threading.Channels" Version="$(SystemThreadingChannelsPackageVersion)" />
116115
<LatestPackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsPackageVersion)" />
117116
<LatestPackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
118-
<LatestPackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsPackageVersion)" />
119117
</ItemGroup>
120118

121119
<ItemGroup Label="External dependencies">
122120
<LatestPackageReference Include="AngleSharp" Version="$(AngleSharpPackageVersion)" />
123121
<LatestPackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetPackageVersion)" />
124122
<LatestPackageReference Include="FSharp.Core" Version="$(FSharpCorePackageVersion)" />
125123
<LatestPackageReference Include="Google.ProtoBuf" Version="$(GoogleProtoBufPackageVersion)" />
124+
<LatestPackageReference Include="IdentityServer4.AspNetIdentity" Version="$(IdentityServer4AspNetIdentityPackageVersion)" />
125+
<LatestPackageReference Include="IdentityServer4.EntityFramework" Version="$(IdentityServer4EntityFrameworkPackageVersion)" />
126+
<LatestPackageReference Include="IdentityServer4" Version="$(IdentityServer4PackageVersion)" />
126127
<LatestPackageReference Include="Libuv" Version="$(LibuvPackageVersion)" />
127128
<LatestPackageReference Include="MessagePack" Version="$(MessagePackPackageVersion)" />
128129
<LatestPackageReference Include="Microsoft.AspNet.WebApi.Client" Version="$(MicrosoftAspNetWebApiClientPackageVersion)" />
129130
<LatestPackageReference Include="Microsoft.Azure.KeyVault" Version="$(MicrosoftAzureKeyVaultPackageVersion)" />
130131
<LatestPackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
131-
<LatestPackageReference Include="IdentityServer4.AspNetIdentity" Version="$(IdentityServer4AspNetIdentityPackageVersion)" />
132-
<LatestPackageReference Include="IdentityServer4.EntityFramework" Version="$(IdentityServer4EntityFrameworkPackageVersion)" />
133-
<LatestPackageReference Include="IdentityServer4" Version="$(IdentityServer4PackageVersion)" />
134132
<LatestPackageReference Include="Moq" Version="$(MoqPackageVersion)" />
135133
<LatestPackageReference Include="Newtonsoft.Json.Bson" Version="$(NewtonsoftJsonBsonPackageVersion)" />
136-
<!-- This version is required by MSBuild tasks or Visual Studio extensions. -->
137-
<LatestPackageReference Include="Newtonsoft.Json" Version="9.0.1" Condition="'$(UseMSBuildJsonNet)' == 'true'" />
138-
<!-- This version should be used by runtime packages -->
139-
<LatestPackageReference Include="Newtonsoft.Json" Version="12.0.1" Condition="'$(UseMSBuildJsonNet)' != 'true'" />
140-
<LatestPackageReference Include="StackExchange.Redis" Version="2.0.513" />
141-
<LatestPackageReference Include="WindowsAzure.Storage" Version="8.1.4" />
142-
<LatestPackageReference Include="Selenium.WebDriver.ChromeDriver" Version="2.43.0" />
143-
<LatestPackageReference Include="Selenium.WebDriver" Version="3.12.1" />
134+
<LatestPackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
135+
<LatestPackageReference Include="Selenium.WebDriver.ChromeDriver" Version="$(SeleniumWebDriverChromeDriverPackageVersion)" />
136+
<LatestPackageReference Include="Selenium.WebDriver" Version="$(SeleniumWebDriverPackageVersion)" />
144137
<LatestPackageReference Include="Serilog.Extensions.Logging" Version="$(SerilogExtensionsLoggingPackageVersion)" />
145138
<LatestPackageReference Include="Serilog.Sinks.File" Version="$(SerilogSinksFilePackageVersion)" />
146139
<LatestPackageReference Include="StackExchange.Redis" Version="$(StackExchangeRedisPackageVersion)" />
147140
<LatestPackageReference Include="System.Reactive.Linq" Version="$(SystemReactiveLinqPackageVersion)" />
148141
<LatestPackageReference Include="Utf8Json" Version="$(Utf8JsonPackageVersion)" />
142+
<LatestPackageReference Include="WindowsAzure.Storage" Version="$(WindowsAzureStoragePackageVersion)" />
149143
<LatestPackageReference Include="xunit.abstractions" Version="$(XunitAbstractionsPackageVersion)" />
150144
<LatestPackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersPackageVersion)" />
151145
<LatestPackageReference Include="xunit.assert" Version="$(XunitAssertPackageVersion)" />

0 commit comments

Comments
 (0)