Skip to content
Merged
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
12 changes: 0 additions & 12 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftBuildFrameworkPackageVersion>17.15.0-preview-25460-104</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildTasksCorePackageVersion>17.15.0-preview-25460-104</MicrosoftBuildTasksCorePackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>17.15.0-preview-25460-104</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25460.104</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-2.25460.104</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-2.25460.104</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25460.104</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25460.104</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25460.104</MicrosoftDotNetHelixSdkPackageVersion>
Expand All @@ -34,12 +28,6 @@ This file should be imported by eng/Versions.props
<!--Property group for alternate package version names-->
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildFrameworkPackageVersion)</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
<MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildUtilitiesCorePackageVersion)</MicrosoftBuildUtilitiesCoreVersion>
<MicrosoftCodeAnalysisCSharpVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildVersion>$(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion)</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>$(MicrosoftDotNetBuildTasksTemplatingPackageVersion)</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetHelixSdkVersion>$(MicrosoftDotNetHelixSdkPackageVersion)</MicrosoftDotNetHelixSdkVersion>
Expand Down
24 changes: 0 additions & 24 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,30 +62,6 @@
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Framework" Version="17.15.0-preview-25460-104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.15.0-preview-25460-104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.15.0-preview-25460-104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25460.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-2.25460.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-2.25460.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>eac14590f69f6876d418cef9e8fdd3f44f6ef0b2</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25460.104">
Expand Down
17 changes: 17 additions & 0 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,23 @@
<PropertyGroup Label="Arcade settings">
<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.8</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildUtilitiesCoreVersion>17.14.8</MicrosoftBuildUtilitiesCoreVersion>
<MicrosoftBuildTasksCoreVersion>17.14.8</MicrosoftBuildTasksCoreVersion>
<MicrosoftCodeAnalysisCSharpVersion>4.14.0</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.14.0</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildVersion>4.14.0</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
</PropertyGroup>
<PropertyGroup Label="MSBuild and Roslyn" Condition="'$(IsServicingBuild)' == 'true'">
<MicrosoftBuildFrameworkVersion>17.15.0</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildUtilitiesCoreVersion>17.15.0</MicrosoftBuildUtilitiesCoreVersion>
<MicrosoftBuildTasksCoreVersion>17.15.0</MicrosoftBuildTasksCoreVersion>
<MicrosoftCodeAnalysisCSharpVersion>5.0.0</MicrosoftCodeAnalysisCSharpVersion>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At the moment, the next Roslyn packages that will be publicly available on nuget.org will be 5.0.0-2.final (corresponding to dev18 preview 1). But neither 5.0.0 nor 5.0.0-2.final exist yet so not critical here.

I will let you know if that changes as we move towards VMR publishing.

<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>
Expand Down
8 changes: 6 additions & 2 deletions src/EFCore.Design/Design/Internal/DbContextOperations.cs
Original file line number Diff line number Diff line change
Expand Up @@ -305,10 +305,14 @@ private IReadOnlyList<string> PrecompileQueries(
{
workspace = MSBuildWorkspace.Create();
workspace.LoadMetadataForReferencedProjects = true;
workspace.RegisterWorkspaceFailedHandler(e =>
#pragma warning disable CS0612 // Obsolete
#pragma warning disable CS0618 // Obsolete
workspace.WorkspaceFailed += (_, e) =>
{
_reporter.WriteError(DesignStrings.MSBuildWorkspaceFailure(e.Diagnostic.Kind, e.Diagnostic.Message));
});
};
#pragma warning restore CS0618 // Obsolete
#pragma warning restore CS0612 // Obsolete
project = workspace.OpenProjectAsync(_project).GetAwaiter().GetResult();
}
catch (Exception ex)
Expand Down
Loading