Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit bc1fb44

Browse files
committed
Use satellites from roslyn package, not cli-deps-satellites
1 parent 8fcbb63 commit bc1fb44

File tree

5 files changed

+1
-112
lines changed

5 files changed

+1
-112
lines changed

build/DependencyVersions.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
<MicrosoftTestPlatformBuildPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformBuildPackageVersion>
4646
<XliffTasksPackageVersion>0.2.0-beta-000042</XliffTasksPackageVersion>
4747
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
48-
<CliDepsSatellitesRoslynPackageVersion>2.6.0-pre-20171122-1</CliDepsSatellitesRoslynPackageVersion>
4948
</PropertyGroup>
5049

5150
<!-- NOTE: The property group above is in alignment with orchestrated build version naming conventions. -->

build/Microsoft.DotNet.Cli.tasks

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Test" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<UsingTask TaskName="AddMetadataIsPE" AssemblyFile="$(CLIBuildDll)" />
4-
<UsingTask TaskName="AddToDeps" AssemblyFile="$(CLIBuildDll)" />
54
<UsingTask TaskName="ChangeEntryPointLibraryName" AssemblyFile="$(CLIBuildDll)" />
65
<UsingTask TaskName="CheckIfAllBuildsHavePublished" AssemblyFile="$(CLIBuildDll)" />
76
<UsingTask TaskName="ChMod" AssemblyFile="$(CLIBuildDll)" />

build_projects/dotnet-cli-build/AddToDeps.cs

Lines changed: 0 additions & 67 deletions
This file was deleted.

src/redist/redist.csproj

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,11 @@
7777
<RoslynBits Include="$(NuGetPackagesDir)/microsoft.netcore.compilers/$(MicrosoftNETCoreCompilersPackageVersion)/tools/**/*" />
7878
</ItemGroup>
7979
<Copy SourceFiles="@(RoslynBits)" DestinationFiles="@(RoslynBits->'$(RoslynDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
80-
<Copy SourceFiles="@(RoslynSatelliteBits)" DestinationFiles="@(RoslynSatelliteBits->'$(RoslynDirectory)/bincore/%(RecursiveDir)%(Filename)%(Extension)')" />
8180
<ItemGroup>
8281
<RoslynRuntimeConfigs Include="$(RoslynDirectory)/bincore/csc.runtimeconfig.json" />
8382
<RoslynRuntimeConfigs Include="$(RoslynDirectory)/bincore/vbc.runtimeconfig.json" />
8483
<RoslynDeps Include="$(RoslynDirectory)/bincore/csc.deps.json" />
8584
<RoslynDeps Include="$(RoslynDirectory)/bincore/vbc.deps.json" />
86-
<RoslynSatelliteDeps Include="$(RoslynDirectory)/bincore/tool_roslyn_satellites.deps.json" />
8785
<RoslynFrameworkAssemblies Include="$(RoslynDirectory)/System.*.dll;$(RoslynDirectory)/runtimes/**/System.*.dll" Exclude="$(RoslynDirectory)/runtimes/**/System.IO.Pipes.AccessControl.dll"/>
8886
</ItemGroup>
8987
<PropertyGroup>
@@ -95,12 +93,7 @@
9593
DestinationFile="%(RoslynRuntimeConfigs.Identity)"
9694
ReplacementPatterns="$(ReplacementPattern)"
9795
ReplacementStrings="$(ReplacementString)" />
98-
<DotNetPublish
99-
ToolPath="$(Stage0Directory)"
100-
Configuration="$(Configuration)"
101-
ProjectPath="$(SrcDirectory)/tool_roslyn_satellites/tool_roslyn_satellites.csproj" />
102-
<AddToDeps TargetDeps="@(RoslynDeps)" AdditionalDeps="@(RoslynSatelliteDeps)" />
103-
<Delete Files="@(RoslynSatelliteDeps);@(RoslynFrameworkAssemblies)" />
96+
<Delete Files="@(RoslynFrameworkAssemblies)" />
10497
</Target>
10598

10699
<Target Name="PublishFSharp"

src/tool_roslyn_satellites/tool_roslyn_satellites.csproj

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)