Skip to content

Commit

Permalink
Remove NuGet.Framework deployment hacks
Browse files Browse the repository at this point in the history
To work around dotnet#61454
we were deploying NuGet.Frameworks versions in various places; now
that we're doing MSBuildWorkspace builds in the build host that
has a separate deployment folder we don't need this anymore.
  • Loading branch information
jasonmalinowski committed Oct 26, 2023
1 parent f474e9b commit 11706b4
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 23 deletions.
11 changes: 0 additions & 11 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -222,17 +222,6 @@
<RoslynBuildUtilVersion>0.9.8-beta</RoslynBuildUtilVersion>
<RoslynDependenciesOptimizationDataVersion>3.0.0-beta2-19053-01</RoslynDependenciesOptimizationDataVersion>
<RoslynDiagnosticsAnalyzersVersion>$(RoslynDiagnosticsNugetPackageVersion)</RoslynDiagnosticsAnalyzersVersion>
<!--
The package "Microsoft.CodeAnalysis.Analyzer.Testing" brings in an earlier version of these NuGet dependencies than
is expected by the NET SDK used in the Workspace.MSBuild UnitTests. In order to test against the same verion of NuGet
as our configured SDK, we must set the version to be the same.
-->
<NuGetCommonVersion>6.8.0-rc.112</NuGetCommonVersion>
<NuGetConfigurationVersion>$(NuGetCommonVersion)</NuGetConfigurationVersion>
<NuGetFrameworksVersion>$(NuGetCommonVersion)</NuGetFrameworksVersion>
<NuGetPackagingVersion>$(NuGetCommonVersion)</NuGetPackagingVersion>
<NuGetProtocolVersion>$(NuGetCommonVersion)</NuGetProtocolVersion>
<NuGetVersioningVersion>$(NuGetCommonVersion)</NuGetVersioningVersion>
<RoslynToolsVSIXExpInstallerVersion>1.1.0-beta3.22474.1</RoslynToolsVSIXExpInstallerVersion>
<RoslynMicrosoftVisualStudioExtensionManagerVersion>0.0.4</RoslynMicrosoftVisualStudioExtensionManagerVersion>
<SourceBrowserVersion>1.0.21</SourceBrowserVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@
<PackageReference Include="Microsoft.VisualStudio.Composition" Version="$(MicrosoftVisualStudioCompositionVersion)" />
<PackageReference Include="Microsoft.VisualStudio.LanguageServer.Protocol" Version="$(MicrosoftVisualStudioLanguageServerProtocolVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace" Version="$(MicrosoftAspNetCoreRazorExternalAccessRoslynWorkspaceVersion)" />
<PackageReference Include="NuGet.Frameworks" Version="$(NuGetFrameworksVersion)" />
<PackageReference Include="StreamJsonRpc" Version="$(StreamJsonRpcVersion)" />
<PackageReference Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,6 @@
<PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(RefOnlyMicrosoftBuildTasksCoreVersion)" ExcludeAssets="Runtime" PrivateAssets="All" />
<PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonVersion)" />

<!--
The package "Microsoft.CodeAnalysis.Analyzer.Testing" brings in a lower version of these NuGet dependencies than is expected by the
NET SDK. In order to test against the same verion of NuGet as our configured SDK, we must set the version to be the same.
-->
<PackageReference Include="NuGet.Common" Version="$(NuGetCommonVersion)" />
<PackageReference Include="NuGet.Configuration" Version="$(NuGetConfigurationVersion)" />
<PackageReference Include="NuGet.Frameworks" Version="$(NuGetFrameworksVersion)" />
<PackageReference Include="NuGet.Packaging" Version="$(NuGetPackagingVersion)" />
<PackageReference Include="NuGet.Protocol" Version="$(NuGetProtocolVersion)" />
<PackageReference Include="NuGet.Versioning" Version="$(NuGetVersioningVersion)" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Xaml" Condition="$(TargetFramework) == 'net472'">
Expand Down

0 comments on commit 11706b4

Please sign in to comment.