Skip to content

[release/10.0] Update MSBuild and Roslyn dependencies #37218

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

Closed
AndriySvyryd wants to merge 1 commit into from
Closed

[release/10.0] Update MSBuild and Roslyn dependencies #37218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 3 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
<PackageVersion Include="NetTopologySuite.IO.SqlServerBytes" Version="2.1.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="mod_spatialite" Version="4.3.0.1" />
<PackageVersion Include="SQLitePCLRaw.core" Version="$(SQLitePCLRawVersion)" />
<PackageVersion Include="SQLitePCLRaw.bundle_sqlite3" Version="$(SQLitePCLRawVersion)" />
<PackageVersion Include="SQLitePCLRaw.bundle_e_sqlite3" Version="$(SQLitePCLRawVersion)" />
<PackageVersion Include="SQLitePCLRaw.core" Version="2.1.11" />
<PackageVersion Include="SQLitePCLRaw.bundle_sqlite3" Version="2.1.11" />
<PackageVersion Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.11" />
</ItemGroup>
</Project>
25 changes: 4 additions & 21 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,12 @@
<UsingToolXliff>False</UsingToolXliff>
</PropertyGroup>
<PropertyGroup Label="MSBuild and Roslyn" Condition="'$(IsServicingBuild)' == 'true'">
<!-- For MSBuild and Roslyn packages use the previous stable version until the current stable build is released. -->
<MicrosoftBuildFrameworkVersion>17.14.28</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildUtilitiesCoreVersion>17.14.28</MicrosoftBuildUtilitiesCoreVersion>
<MicrosoftBuildTasksCoreVersion>17.14.28</MicrosoftBuildTasksCoreVersion>
<MicrosoftCodeAnalysisCSharpVersion>4.14.0</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.14.0</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildVersion>4.14.0</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
</PropertyGroup>
<!-- Revert once roslyn publishes 5.0.0 packages
<PropertyGroup Label="MSBuild and Roslyn" Condition="'$(IsServicingBuild)' == 'true'">
<MicrosoftBuildFrameworkVersion>17.15.0</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildUtilitiesCoreVersion>17.15.0</MicrosoftBuildUtilitiesCoreVersion>
<MicrosoftBuildTasksCoreVersion>17.15.0</MicrosoftBuildTasksCoreVersion>
<!-- Use the current stable builds for MSBuild and Roslyn packages, next version (non-servicing) will use the preview builds -->
<MicrosoftBuildFrameworkVersion>18.0.2</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildUtilitiesCoreVersion>18.0.2</MicrosoftBuildUtilitiesCoreVersion>
<MicrosoftBuildTasksCoreVersion>18.0.2</MicrosoftBuildTasksCoreVersion>
<MicrosoftCodeAnalysisCSharpVersion>5.0.0</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>5.0.0</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildVersion>5.0.0</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
</PropertyGroup> -->
<PropertyGroup Label="Other dependencies">
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.3-beta1.24423.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
<MicrosoftCodeAnalysisCSharpTestingVersion>1.1.3-beta1.24352.1</MicrosoftCodeAnalysisCSharpTestingVersion>
<AzureIdentityVersion>1.14.2</AzureIdentityVersion>
<AzureResourceManagerCosmosDBVersion>1.3.2</AzureResourceManagerCosmosDBVersion>
<OpenTelemetryExporterInMemoryVersion>1.12.0</OpenTelemetryExporterInMemoryVersion>
<SQLitePCLRawVersion>2.1.11</SQLitePCLRawVersion>
</PropertyGroup>
</Project>
10 changes: 0 additions & 10 deletions src/ef/ef.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,6 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Configuration" />
</ItemGroup>

<PropertyGroup>
<!-- Permit targeting `netcoreapp2.0`, see https://github.com/dotnet/efcore/issues/34654 -->
<NoWarn>$(NoWarn);NU1903</NoWarn>
</PropertyGroup>

<ItemGroup>
<!-- Permit targeting `netcoreapp2.0`, see https://github.com/dotnet/efcore/issues/34654 -->
<NuGetAuditSuppress Include="https://github.com/advisories/GHSA-7mfr-774f-w5r9" />
</ItemGroup>

<ItemGroup>
<None Update="Generators\BundleProgramGenerator.tt">
Expand Down
18 changes: 9 additions & 9 deletions test/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<!-- Dependencies used only in tests -->
<ItemGroup>
<!-- See https://github.com/dotnet/roslyn-sdk/issues/1175 -->
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="$(MicrosoftCodeAnalysisAnalyzerTestingVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="$(MicrosoftCodeAnalysisCSharpTestingVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="$(MicrosoftCodeAnalysisCSharpTestingVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="1.1.3-beta1.24423.1" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.3-beta1.24352.1" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.1.3-beta1.24352.1" />

<PackageVersion Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
<PackageVersion Include="Azure.ResourceManager.CosmosDB" Version="$(AzureResourceManagerCosmosDBVersion)" />
<PackageVersion Include="Azure.Identity" Version="1.14.2" />
<PackageVersion Include="Azure.ResourceManager.CosmosDB" Version="1.3.2" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.5" />
<PackageVersion Include="Microsoft.AspNetCore.OData" Version="9.3.1" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationVersion)" />
Expand All @@ -18,10 +18,10 @@
<PackageVersion Include="IdentityServer4.EntityFramework" Version="4.1.2" />
<PackageVersion Include="Grpc.AspNetCore" Version="2.71.0" />
<PackageVersion Include="NetTopologySuite.IO.GeoJSON" Version="4.0.0" />
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="$(OpenTelemetryExporterInMemoryVersion)" />
<PackageVersion Include="SQLitePCLRaw.bundle_e_sqlcipher" Version="$(SQLitePCLRawVersion)" />
<PackageVersion Include="SQLitePCLRaw.bundle_e_sqlite3mc" Version="$(SQLitePCLRawVersion)" />
<PackageVersion Include="SQLitePCLRaw.bundle_winsqlite3" Version="$(SQLitePCLRawVersion)" />
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.12.0" />
<PackageVersion Include="SQLitePCLRaw.bundle_e_sqlcipher" Version="2.1.11" />
<PackageVersion Include="SQLitePCLRaw.bundle_e_sqlite3mc" Version="2.1.11" />
<PackageVersion Include="SQLitePCLRaw.bundle_winsqlite3" Version="2.1.11" />

<!-- Pinned versions for Component Governance/NuGetAudit - Remove when root dependencies are updated -->
<!--Workaround for IdentityServer4.EntityFramework v4.1.2-->
Expand Down
18 changes: 9 additions & 9 deletions .../EFCore.Cosmos.FunctionalTests/Scaffolding/Baselines/Basic_cosmos_model/DataEntityType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
int (IInternalEntry entry) => entry.ReadShadowValue<int>(0),
int (IInternalEntry entry) => entry.ReadShadowValue<int>(0),
int (IInternalEntry entry) => entry.ReadOriginalValue<int>(id, 0),
int (IInternalEntry entry) => ((InternalEntityEntry)(entry)).ReadRelationshipSnapshotValue<int>(id, 0));
int (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<int>(id, 0));
id.SetPropertyIndexes(
index: 0,
originalValueIndex: 0,
Expand Down Expand Up @@ -77,7 +77,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
long? (IInternalEntry entry) => entry.ReadShadowValue<long?>(1),
long? (IInternalEntry entry) => entry.ReadShadowValue<long?>(1),
long? (IInternalEntry entry) => entry.ReadOriginalValue<long?>(partitionId, 1),
long? (IInternalEntry entry) => ((InternalEntityEntry)(entry)).ReadRelationshipSnapshotValue<long?>(partitionId, 1));
long? (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<long?>(partitionId, 1));
partitionId.SetPropertyIndexes(
index: 1,
originalValueIndex: 1,
Expand All @@ -98,12 +98,12 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
int (string v) => ((object)v).GetHashCode(),
string (string v) => v),
converter: new ValueConverter<long, string>(
string (long v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)(v))),
string (long v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
long (string v) => long.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture)),
jsonValueReaderWriter: new JsonConvertedValueReaderWriter<long, string>(
JsonStringReaderWriter.Instance,
new ValueConverter<long, string>(
string (long v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)(v))),
string (long v) => string.Format(CultureInfo.InvariantCulture, "{0}", ((object)v)),
long (string v) => long.Parse(v, NumberStyles.Any, CultureInfo.InvariantCulture))));
partitionId.SetCurrentValueComparer(new EntryCurrentValueComparer<long?>(partitionId));
partitionId.SetComparer(new NullableValueComparer<long>(partitionId.TypeMapping.Comparer));
Expand Down Expand Up @@ -143,12 +143,12 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
storeGenerationIndex: -1);
blob.TypeMapping = CosmosTypeMapping.Default.Clone(
comparer: new ValueComparer<byte[]>(
bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)(v1)), ((object)(v2))),
bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
int (byte[] v) => ((object)v).GetHashCode(),
byte[] (byte[] v) => v),
keyComparer: new ValueComparer<byte[]>(
bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)(v1)), ((object)(v2))),
int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)(v))),
bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
byte[] (byte[] source) => source.ToArray()),
providerValueComparer: new ValueComparer<string>(
bool (string v1, string v2) => v1 == v2,
Expand Down Expand Up @@ -188,8 +188,8 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
int (ReadOnlyMemory<byte> v) => ((object)v).GetHashCode(),
ReadOnlyMemory<byte> (ReadOnlyMemory<byte> v) => v),
providerValueComparer: new ValueComparer<byte[]>(
bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)(v1)), ((object)(v2))),
int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)(v))),
bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v)),
byte[] (byte[] source) => source.ToArray()),
converter: new ValueConverter<ReadOnlyMemory<byte>, byte[]>(
byte[] (ReadOnlyMemory<byte> v) => ReadOnlyMemoryConverter<byte>.ToArray(v),
Expand Down
22 changes: 11 additions & 11 deletions test/EFCore.Cosmos.FunctionalTests/Scaffolding/Baselines/BigModel/DependentBaseEntityType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
long (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(0) ? entry.ReadStoreGeneratedValue<long>(0) : (entry.FlaggedAsTemporary(0) && entry.ReadShadowValue<long>(0) == 0L ? entry.ReadTemporaryValue<long>(0) : entry.ReadShadowValue<long>(0))),
long (IInternalEntry entry) => entry.ReadShadowValue<long>(0),
long (IInternalEntry entry) => entry.ReadOriginalValue<long>(principalId, 0),
long (IInternalEntry entry) => ((InternalEntityEntry)(entry)).ReadRelationshipSnapshotValue<long>(principalId, 0));
long (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<long>(principalId, 0));
principalId.SetPropertyIndexes(
index: 0,
originalValueIndex: 0,
Expand Down Expand Up @@ -79,7 +79,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
Guid (IInternalEntry entry) => (entry.FlaggedAsStoreGenerated(1) ? entry.ReadStoreGeneratedValue<Guid>(1) : (entry.FlaggedAsTemporary(1) && entry.ReadShadowValue<Guid>(1) == new Guid("00000000-0000-0000-0000-000000000000") ? entry.ReadTemporaryValue<Guid>(1) : entry.ReadShadowValue<Guid>(1))),
Guid (IInternalEntry entry) => entry.ReadShadowValue<Guid>(1),
Guid (IInternalEntry entry) => entry.ReadOriginalValue<Guid>(principalAlternateId, 1),
Guid (IInternalEntry entry) => ((InternalEntityEntry)(entry)).ReadRelationshipSnapshotValue<Guid>(principalAlternateId, 1));
Guid (IInternalEntry entry) => ((InternalEntityEntry)entry).ReadRelationshipSnapshotValue<Guid>(principalAlternateId, 1));
principalAlternateId.SetPropertyIndexes(
index: 1,
originalValueIndex: 1,
Expand Down Expand Up @@ -128,25 +128,25 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
storeGenerationIndex: -1);
enumDiscriminator.TypeMapping = CosmosTypeMapping.Default.Clone(
comparer: new ValueComparer<CompiledModelTestBase.Enum1>(
bool (CompiledModelTestBase.Enum1 v1, CompiledModelTestBase.Enum1 v2) => object.Equals(((object)(v1)), ((object)(v2))),
bool (CompiledModelTestBase.Enum1 v1, CompiledModelTestBase.Enum1 v2) => object.Equals(((object)v1), ((object)v2)),
int (CompiledModelTestBase.Enum1 v) => ((object)v).GetHashCode(),
CompiledModelTestBase.Enum1 (CompiledModelTestBase.Enum1 v) => v),
keyComparer: new ValueComparer<CompiledModelTestBase.Enum1>(
bool (CompiledModelTestBase.Enum1 v1, CompiledModelTestBase.Enum1 v2) => object.Equals(((object)(v1)), ((object)(v2))),
bool (CompiledModelTestBase.Enum1 v1, CompiledModelTestBase.Enum1 v2) => object.Equals(((object)v1), ((object)v2)),
int (CompiledModelTestBase.Enum1 v) => ((object)v).GetHashCode(),
CompiledModelTestBase.Enum1 (CompiledModelTestBase.Enum1 v) => v),
providerValueComparer: new ValueComparer<int>(
bool (int v1, int v2) => v1 == v2,
int (int v) => v,
int (int v) => v),
converter: new ValueConverter<CompiledModelTestBase.Enum1, int>(
int (CompiledModelTestBase.Enum1 value) => ((int)(value)),
CompiledModelTestBase.Enum1 (int value) => ((CompiledModelTestBase.Enum1)(value))),
int (CompiledModelTestBase.Enum1 value) => ((int)value),
CompiledModelTestBase.Enum1 (int value) => ((CompiledModelTestBase.Enum1)value)),
jsonValueReaderWriter: new JsonConvertedValueReaderWriter<CompiledModelTestBase.Enum1, int>(
JsonInt32ReaderWriter.Instance,
new ValueConverter<CompiledModelTestBase.Enum1, int>(
int (CompiledModelTestBase.Enum1 value) => ((int)(value)),
CompiledModelTestBase.Enum1 (int value) => ((CompiledModelTestBase.Enum1)(value)))));
int (CompiledModelTestBase.Enum1 value) => ((int)value),
CompiledModelTestBase.Enum1 (int value) => ((CompiledModelTestBase.Enum1)value))));
enumDiscriminator.SetSentinelFromProviderValue(0);

var id = runtimeEntityType.AddProperty(
Expand Down Expand Up @@ -184,15 +184,15 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
id.TypeMapping = CosmosTypeMapping.Default.Clone(
comparer: new ValueComparer<byte>(
bool (byte v1, byte v2) => v1 == v2,
int (byte v) => ((int)(v)),
int (byte v) => ((int)v),
byte (byte v) => v),
keyComparer: new ValueComparer<byte>(
bool (byte v1, byte v2) => v1 == v2,
int (byte v) => ((int)(v)),
int (byte v) => ((int)v),
byte (byte v) => v),
providerValueComparer: new ValueComparer<byte>(
bool (byte v1, byte v2) => v1 == v2,
int (byte v) => ((int)(v)),
int (byte v) => ((int)v),
byte (byte v) => v),
clrType: typeof(byte),
jsonValueReaderWriter: JsonByteReaderWriter.Instance);
Expand Down
Loading
Loading