Skip to content

Update the nuget version to the latest and update STJ to the in-product one that's being used already in most of the build here #9083

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

Open
wants to merge 5 commits into
base: release/9.0.1xx
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 7 additions & 12 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,20 @@
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.8.3" />

<!-- NuGet dependencies -->
<PackageVersion Include="NuGet.Configuration" Version="6.12.1" />
<PackageVersion Include="NuGet.Credentials" Version="6.12.1" />
<PackageVersion Include="NuGet.Protocol" Version="6.12.1" />
<PackageVersion Include="NuGet.Configuration" Version="$(NuGetConfigurationVersion)" />
<PackageVersion Include="NuGet.Credentials" Version="$(NuGetCredentialsVersion)" />
<PackageVersion Include="NuGet.Protocol" Version="$(NuGetProtocolVersion)" />

<!-- Roslyn-analyzers dependencies -->
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />

<!-- Runtime dependencies -->
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsVersion)" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
<PackageVersion Include="Microsoft.IO.Redist" Version="6.0.1" />
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
<PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
</ItemGroup>

<!-- External dependencies -->
Expand All @@ -50,12 +51,6 @@
<PackageVersion Update="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" Condition="'$(MicrosoftBuildFrameworkVersion)' != ''" />
<PackageVersion Update="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" Condition="'$(MicrosoftBuildUtilitiesCoreVersion)' != ''" />
<PackageVersion Update="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="$(MicrosoftCodeAnalysisPublicApiAnalyzersVersion)" Condition="'$(MicrosoftCodeAnalysisPublicApiAnalyzersVersion)' != ''" />
<PackageVersion Update="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsVersion)" Condition="'$(MicrosoftExtensionsLoggingAbstractionsVersion)' != ''" />
<PackageVersion Update="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" Condition="'$(MicrosoftExtensionsLoggingConsoleVersion)' != ''" />
<PackageVersion Update="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" Condition="'$(MicrosoftExtensionsLoggingVersion)' != ''" />
<PackageVersion Update="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" Condition="'$(NewtonsoftJsonVersion)' != ''" />
<PackageVersion Update="NuGet.Configuration" Version="$(NuGetConfigurationVersion)" Condition="'$(NuGetConfigurationVersion)' != ''" />
<PackageVersion Update="NuGet.Credentials" Version="$(NuGetCredentialsVersion)" Condition="'$(NuGetCredentialsVersion)' != ''" />
<PackageVersion Update="NuGet.Protocol" Version="$(NuGetProtocolVersion)" Condition="'$(NuGetProtocolVersion)' != ''" />
</ItemGroup>
</Project>
10 changes: 10 additions & 0 deletions eng/SourceBuildPrebuiltBaseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,15 @@
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions/9.0.*" />
<UsagePattern IdentityGlob="Microsoft.Extensions.Logging.Abstractions/9.0.*" />
<UsagePattern IdentityGlob="System.Diagnostics.DiagnosticSource/9.0.*" />
<UsagePattern IdentityGlob="NuGet.Common/6.12.*" />
<UsagePattern IdentityGlob="NuGet.Configuration/6.12.*" />
<UsagePattern IdentityGlob="NuGet.Credentials/6.12.*" />
<UsagePattern IdentityGlob="NuGet.Frameworks/6.12.*" />
<UsagePattern IdentityGlob="NuGet.Packaging/6.12.*" />
<UsagePattern IdentityGlob="NuGet.Protocol/6.12.*" />
<UsagePattern IdentityGlob="NuGet.Versioning/6.12.*" />
<UsagePattern IdentityGlob="System.IO.Pipelines/9.0.*" />
<UsagePattern IdentityGlob="System.Text.Encodings.Web/9.0.*" />
<UsagePattern IdentityGlob="System.Text.Json/9.0.*" />
</IgnorePatterns>
</UsageData>
40 changes: 40 additions & 0 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,18 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
</Dependency>
<Dependency Name="System.IO.Pipelines" Version="9.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="9.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="9.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
Expand All @@ -50,5 +62,33 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
</Dependency>
<Dependency Name="NuGet.Common" Version="6.12.4">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
</Dependency>
<Dependency Name="NuGet.Configuration" Version="6.12.4">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
</Dependency>
<Dependency Name="NuGet.Credentials" Version="6.12.4">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
</Dependency>
<Dependency Name="NuGet.Frameworks" Version="6.12.4">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
</Dependency>
<Dependency Name="NuGet.Packaging" Version="6.12.4">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
</Dependency>
<Dependency Name="NuGet.Protocol" Version="6.12.4">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
</Dependency>
<Dependency Name="NuGet.Versioning" Version="6.12.4">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
18 changes: 14 additions & 4 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,19 @@
<PropertyGroup>
<!-- Non-maestro versions -->
<SystemFormatsAsn1Version>9.0.0</SystemFormatsAsn1Version>
<MicrosoftExtensionsLoggingPackageVersion>9.0.3</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>9.0.3</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>9.0.3</MicrosoftExtensionsLoggingConsolePackageVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>9.0.3</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
<SystemIOPipelinesVersion>9.0.3</SystemIOPipelinesVersion>
<SystemTextEncodingsWebVersion>9.0.3</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>9.0.3</SystemTextJsonVersion>
<MicrosoftExtensionsLoggingVersion>9.0.3</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.3</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConsoleVersion>9.0.3</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.3</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<NuGetCommonVersion>6.12.4</NuGetCommonVersion>
<NuGetConfigurationVersion>6.12.4</NuGetConfigurationVersion>
<NuGetCredentialsVersion>6.12.4</NuGetCredentialsVersion>
<NuGetFrameworksVersion>6.12.4</NuGetFrameworksVersion>
<NuGetPackagingVersion>6.12.4</NuGetPackagingVersion>
<NuGetProtocolVersion>6.12.4</NuGetProtocolVersion>
<NuGetVersioningVersion>6.12.4</NuGetVersioningVersion>
</PropertyGroup>
</Project>