diff --git a/Directory.Build.targets b/Directory.Build.targets index 0aee89fabf..7cffa5ddb2 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,6 +1,20 @@ + + + + + + + + + + + + + + diff --git a/build.cake b/build.cake index 96796fde16..df1fcd3e67 100644 --- a/build.cake +++ b/build.cake @@ -594,20 +594,6 @@ string PublishBuild(string project, BuildEnvironment env, BuildPlan plan, string throw; } - if (framework is "net6.0") - { - // Delete NuGet libraries so they can be loaded from SDK folder. - foreach (var filePath in DirectoryHelper.GetFiles(outputFolder, "NuGet.*.dll")) - { - FileHelper.Delete(filePath); - } - - foreach (var filePath in DirectoryHelper.GetFiles(outputFolder, "System.Configuration.ConfigurationManager.dll")) - { - FileHelper.Delete(filePath); - } - } - CopyExtraDependencies(env, outputFolder); AddOmniSharpBindingRedirects(outputFolder); diff --git a/build/Packages.props b/build/Packages.props index 42906eae85..c7823fd4ce 100644 --- a/build/Packages.props +++ b/build/Packages.props @@ -61,9 +61,15 @@ - + + + + + + + @@ -73,6 +79,7 @@ + @@ -95,4 +102,3 @@ - diff --git a/src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj b/src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj index 925aa8f20f..e0c80381fe 100644 --- a/src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj +++ b/src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj @@ -11,6 +11,7 @@ 6.0.0-preview.7.21317.1 LatestMajor + true diff --git a/src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj b/src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj index 005c09b960..02d9a658d1 100644 --- a/src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj +++ b/src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj @@ -11,6 +11,7 @@ 6.0.0-preview.7.21317.1 LatestMajor + true