Skip to content
代码片段 群组 项目
未验证 提交 74c6ccfe 编辑于 作者: Fredric Silberberg's avatar Fredric Silberberg
浏览文件

Remove conditional msbuild references, update MS.CA.Workspaces.MSBuild to net6.0.

上级 9f6cf4ae
No related branches found
No related tags found
无相关合并请求
......@@ -30,12 +30,7 @@
<ILDAsmPackageVersion>5.0.0-preview.1.20112.8</ILDAsmPackageVersion>
<MicrosoftVisualStudioLanguageServerProtocolPackagesVersion>17.2.8</MicrosoftVisualStudioLanguageServerProtocolPackagesVersion>
<MicrosoftVisualStudioShellPackagesVersion>17.2.32505.113</MicrosoftVisualStudioShellPackagesVersion>
<RefOnlyMicrosoftBuildPackagesVersion>16.5.0</RefOnlyMicrosoftBuildPackagesVersion>
<!--
Microsoft.VisualStudio.Shell.15.0 has a ref to MSBuild 17.1.0, so for those projects that depend on both we
need a new MSBuild version.
-->
<RefOnlyMicrosoftBuildPackagesVersion_WithShellDependency>17.1.0</RefOnlyMicrosoftBuildPackagesVersion_WithShellDependency>
<RefOnlyMicrosoftBuildPackagesVersion>17.1.0</RefOnlyMicrosoftBuildPackagesVersion>
<!-- The version of Roslyn we build Source Generators against that are built in this
repository. This must be lower than MicrosoftNetCompilersToolsetVersion,
but not higher than our minimum dogfoodable Visual Studio version, or else
......@@ -72,10 +67,6 @@
<RefOnlyMicrosoftBuildFrameworkVersion>$(RefOnlyMicrosoftBuildPackagesVersion)</RefOnlyMicrosoftBuildFrameworkVersion>
<RefOnlyMicrosoftBuildRuntimeVersion>$(RefOnlyMicrosoftBuildPackagesVersion)</RefOnlyMicrosoftBuildRuntimeVersion>
<RefOnlyMicrosoftBuildTasksCoreVersion>$(RefOnlyMicrosoftBuildPackagesVersion)</RefOnlyMicrosoftBuildTasksCoreVersion>
<RefOnlyMicrosoftBuildVersion_WithShellDependency>$(RefOnlyMicrosoftBuildPackagesVersion_WithShellDependency)</RefOnlyMicrosoftBuildVersion_WithShellDependency>
<RefOnlyMicrosoftBuildFrameworkVersion_WithShellDependency>$(RefOnlyMicrosoftBuildPackagesVersion_WithShellDependency)</RefOnlyMicrosoftBuildFrameworkVersion_WithShellDependency>
<RefOnlyMicrosoftBuildRuntimeVersion_WithShellDependency>$(RefOnlyMicrosoftBuildPackagesVersion_WithShellDependency)</RefOnlyMicrosoftBuildRuntimeVersion_WithShellDependency>
<RefOnlyMicrosoftBuildTasksCoreVersion_WithShellDependency>$(RefOnlyMicrosoftBuildPackagesVersion_WithShellDependency)</RefOnlyMicrosoftBuildTasksCoreVersion_WithShellDependency>
<NuGetVisualStudioContractsVersion>6.0.0-preview.0.15</NuGetVisualStudioContractsVersion>
<MicrosoftVisualStudioRpcContractsVersion>17.2.31</MicrosoftVisualStudioRpcContractsVersion>
<!--
......
......@@ -115,9 +115,9 @@
<PackageReference Include="Microsoft.VisualStudio.Interop" Version="$(MicrosoftVisualStudioInteropVersion)" />
<PackageReference Include="Microsoft.VisualStudio.ProjectSystem.Managed" Version="$(MicrosoftVisualStudioProjectSystemManagedVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="$(MicrosoftVisualStudioShell150Version)" />
<PackageReference Include="Microsoft.Build" Version="$(RefOnlyMicrosoftBuildVersion_WithShellDependency)" />
<PackageReference Include="Microsoft.Build.Framework" Version="$(RefOnlyMicrosoftBuildFrameworkVersion_WithShellDependency)" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(RefOnlyMicrosoftBuildTasksCoreVersion_WithShellDependency)" />
<PackageReference Include="Microsoft.Build" Version="$(RefOnlyMicrosoftBuildVersion)" />
<PackageReference Include="Microsoft.Build.Framework" Version="$(RefOnlyMicrosoftBuildFrameworkVersion)" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(RefOnlyMicrosoftBuildTasksCoreVersion)" />
<PackageReference Include="Microsoft.VisualStudio.SDK.Analyzers" Version="$(MicrosoftVisualStudioSDKAnalyzersVersion)" PrivateAssets="all" />
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(MicrosoftVisualStudioThreadingVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Validation" Version="$(MicrosoftVisualStudioValidationVersion)" />
......
......@@ -12,7 +12,7 @@
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="$(BenchmarkDotNetDiagnosticsWindowsVersion)" />
<PackageReference Include="Microsoft.Build.Framework" Version="$(RefOnlyMicrosoftBuildFrameworkVersion_WithShellDependency)" ExcludeAssets="Runtime" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Framework" Version="$(RefOnlyMicrosoftBuildFrameworkVersion)" ExcludeAssets="Runtime" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Composition" Version="$(MicrosoftVisualStudioCompositionVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="$(MicrosoftVisualStudioImagingInterop140DesignTimeVersion)" />
......
......@@ -473,6 +473,7 @@ private void SaveDocumentText(DocumentId id, string fullPath, SourceText newText
try
{
var dir = Path.GetDirectoryName(fullPath);
Debug.Assert(dir != null);
if (!Directory.Exists(dir))
{
Directory.CreateDirectory(dir);
......
......@@ -34,7 +34,7 @@ public async Task<IProjectFile> LoadProjectFileAsync(string path, ProjectBuildMa
return this.CreateProjectFile(project, buildManager, log);
}
public static IProjectFileLoader GetLoaderForProjectFileExtension(HostWorkspaceServices workspaceServices, string extension)
public static IProjectFileLoader? GetLoaderForProjectFileExtension(HostWorkspaceServices workspaceServices, string extension)
{
return workspaceServices.FindLanguageServices<IProjectFileLoader>(
d => d.GetEnumerableMetadata<string>("ProjectFileExtension").Any(e => string.Equals(e, extension, StringComparison.OrdinalIgnoreCase)))
......
......@@ -5,7 +5,7 @@
<OutputType>Library</OutputType>
<RootNamespace>Microsoft.CodeAnalysis</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
<TargetFrameworks>net6.0;net472</TargetFrameworks>
<DefineConstants>$(DefineConstants);WORKSPACE_MSBUILD</DefineConstants>
<!-- NuGet -->
<IsPackable>true</IsPackable>
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册