Skip to content
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.

Sign up for GitHub

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

Downgrade several 7.0.* packages to 6.0.* #1799

Merged
merged 5 commits into from
Jul 4, 2023
Merged

Downgrade several 7.0.* packages to 6.0.* #1799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8633a57
Downgrade several 7.0.* packages to 6.0.*
stephentoub Jun 30, 2023
394a3c9
Merge branch 'main' into downgradepackages
shawncal Jul 3, 2023
20de370
Merge branch 'main' into downgradepackages
stephentoub Jul 3, 2023
ec7af15
Update dependabot to ignore System/Microsoft.Extensions major version…
stephentoub Jul 3, 2023
37560b6
Merge branch 'main' into downgradepackages
shawncal Jul 4, 2023
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
6 changes: 6 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ updates:
schedule:
interval: "weekly"
day: "monday"
ignore:
# For all System.* and Microsoft.Extensions.* packages, ignore all major version updates
- dependency-name: "System.*"
update-types: ["version-update:semver-major"]
- dependency-name: "Microsoft.Extensions.*"
update-types: ["version-update:semver-major"]
labels:
- ".NET"
- "dependencies"
Expand Down
26 changes: 13 additions & 13 deletions dotnet/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@
<PackageVersion Include="Azure.Identity" Version="1.9.0" />
<PackageVersion Include="Azure.Search.Documents" Version="11.5.0-beta.2" />
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="[1.1.0, )" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="[7.0.0, )" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="7.0.0" />
<PackageVersion Include="NRedisStack" Version="0.7.0" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="6.0.0" />
<PackageVersion Include="NRedisStack" Version="0.6.1" />
<PackageVersion Include="Pgvector" Version="0.1.3" />
<PackageVersion Include="Polly" Version="7.2.4" />
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
<PackageVersion Include="System.Text.Json" Version="[7.0.2, )" />
<PackageVersion Include="System.Text.Json" Version="6.0.8" />
<!-- Microsoft.Extensions.Logging -->
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="[7.0.0, )" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="[7.0.0, )" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.4" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<!-- Microsoft.Extensions.Configuration -->
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0-preview.5.23280.8" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
<!-- Test -->
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageVersion Include="Moq" Version="4.18.4" />
Expand All @@ -34,7 +34,7 @@
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
<!-- Skills -->
<PackageVersion Include="DocumentFormat.OpenXml" Version="2.20.0" />
<PackageVersion Include="Microsoft.Data.Sqlite" Version="[7.0, )" />
<PackageVersion Include="Microsoft.Data.Sqlite" Version="6.0.19" />
<PackageVersion Include="DuckDB.NET.Data.Full" Version="[0.8, )" />
<PackageVersion Include="DuckDB.NET.Data" Version="[0.8, )" />
<PackageVersion Include="Microsoft.Graph" Version="[4.51.0, 5)" />
Expand Down
4 changes: 4 additions & 0 deletions dotnet/samples/KernelSyntaxExamples/KernelSyntaxExamples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@
<ProjectReference Include="..\..\src\Skills\Skills.Web\Skills.Web.csproj" />
<ProjectReference Include="..\..\src\SemanticKernel\SemanticKernel.csproj" />
<ProjectReference Include="..\NCalcSkills\NCalcSkills.csproj" />

<!-- Because some of the referenced projects have dependencies that themselves have System.Text.Json set with a minimum of 7.0. -->
<PackageReference Include="System.Text.Json" />
<PackageVersion Update="System.Text.Json" Version="7.0.3" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\30-user-prompt.txt" />
Expand Down
3 changes: 3 additions & 0 deletions dotnet/src/Connectors/Connectors.Memory.Postgres/Connectors.Memory.Postgres.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
<ItemGroup>
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
<PackageReference Include="Pgvector" />

<!-- pgvector pulls in a 7.0 version -->
<PackageVersion Update="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 4 additions & 0 deletions dotnet/src/Connectors/Connectors.UnitTests/Connectors.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>

<!-- Because some of the referenced projects have dependencies that themselves have System.Text.Json set with a minimum of 7.0. -->
shawncal marked this conversation as resolved.
Show resolved Hide resolved
<PackageReference Include="System.Text.Json" />
<PackageVersion Update="System.Text.Json" Version="7.0.3" />
</ItemGroup>

<Import Project="$(RepoRoot)/dotnet/src/InternalUtilities/src/InternalUtilities.props" />
Expand Down
4 changes: 4 additions & 0 deletions dotnet/src/IntegrationTests/IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>

<!-- Because some of the referenced projects have dependencies that themselves have System.Text.Json set with a minimum of 7.0. -->
<PackageReference Include="System.Text.Json" />
<PackageVersion Update="System.Text.Json" Version="7.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions dotnet/src/IntegrationTests/RedirectOutput.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ public override void WriteLine(string? value)
this._logs.AppendLine(value);
}

public IDisposable? BeginScope<TState>(TState state) where TState : notnull
public IDisposable BeginScope<TState>(TState state)
{
return null;
return null!;
}

public bool IsEnabled(LogLevel logLevel)
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/IntegrationTests/XunitLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
public bool IsEnabled(LogLevel logLevel) => true;

/// <inheritdoc/>
public IDisposable BeginScope<TState>(TState state) where TState : notnull
public IDisposable BeginScope<TState>(TState state)
=> this;

/// <inheritdoc/>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/Skills/Skills.UnitTests/XunitHelpers/XunitLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
public bool IsEnabled(LogLevel logLevel) => true;

/// <inheritdoc/>
public IDisposable BeginScope<TState>(TState state) where TState : notnull
public IDisposable BeginScope<TState>(TState state)
=> this;

/// <inheritdoc/>
Expand Down