Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitada0799

Browse files
authored
Merge pull requestdotnet#4735 from Microsoft/drop-symreader
remove DiaSymReader package dependencies since they're not used
2 parents7090302 +dba6662 commitada0799

File tree

19 files changed

+3
-56
lines changed

19 files changed

+3
-56
lines changed

‎build/config/AssemblySignToolData.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@
6363
"Microsoft.Build.Framework.dll",
6464
"Microsoft.Build.Tasks.Core.dll",
6565
"Microsoft.Build.Utilities.Core.dll",
66-
"Microsoft.DiaSymReader.dll",
67-
"Microsoft.DiaSymReader.PortablePdb.dll",
6866
"Newtonsoft.Json.dll",
6967
"System.Collections.Immutable.dll",
7068
"System.Reflection.Metadata.dll",

‎build/projects/PrepareDependencyUptake.proj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
<!-- Prepare a dummy packages.config-->
1313
<ItemGroup>
1414
<PackagesConfigLinesInclude="&lt;packages&gt;" />
15-
<PackagesConfigLinesInclude="&lt;package id=&quot;Microsoft.DiaSymReader&quot; version=&quot;$(MicrosoftDiaSymReaderPackageVersion)&quot; /&gt;" />
16-
<PackagesConfigLinesInclude="&lt;package id=&quot;Microsoft.DiaSymReader.PortablePdb&quot; version=&quot;$(MicrosoftDiaSymReaderPortablePdbPackageVersion)&quot; /&gt;" />
1715
<PackagesConfigLinesInclude="&lt;/packages&gt;" />
1816
</ItemGroup>
1917

‎fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -631,8 +631,6 @@
631631
<PackageReferenceInclude="FSharp.Core"Version="4.1.*" />
632632
<PackageReferenceInclude="System.Collections.Immutable"Version="1.3.1" />
633633
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.4.2" />
634-
<PackageReferenceInclude="Microsoft.DiaSymReader.PortablePdb"Version="1.2.0" />
635-
<PackageReferenceInclude="Microsoft.DiaSymReader"Version="1.1.0" />
636634
</ItemGroup>
637635
<ItemGroupCondition="'$(TargetFramework)' == 'netstandard2.0'">
638636
<PackageReferenceInclude="System.Diagnostics.Process"Version="4.1.0" />

‎packages.config‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
<!-- Actual dependencies of FSharp.Compiler.dll and FSharp.Core.dll-->
1818
<packageid="System.Collections.Immutable"version="1.3.1" />
1919
<packageid="System.Reflection.Metadata"version="1.4.2" />
20-
<packageid="Microsoft.DiaSymReader.PortablePdb"version="1.2.0" />
21-
<packageid="Microsoft.DiaSymReader"version="1.1.0" />
2220
<packageid="System.ValueTuple"version="4.3.1" />
2321
<packageid="System.ValueTuple"version="4.4.0" />
2422
<packageid="Microsoft.VisualFSharp.Msbuild.15.0"version="1.0.1" />

‎setup/FSharp.SDK/component-groups/Compiler_Redist.wxs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
<ComponentRefId="Compiler_Redist_Microsoft.Build.Tasks.Core.dll" />
2929
<ComponentRefId="Compiler_Redist_Microsoft.Build.Utilities.Core.dll" />
3030

31-
<ComponentRefId="Compiler_Redist_Microsoft.DiaSymReader.PortablePdb.dll" />
32-
<ComponentRefId="Compiler_Redist_Microsoft.DiaSymReader.dll" />
3331
<ComponentRefId="Compiler_Redist_System.Reflection.Metadata.dll" />
3432
<ComponentRefId="Compiler_Redist_System.Collections.Immutable.dll" />
3533
<ComponentRefId="Compiler_Redist_System.ValueTuple.dll" />
@@ -184,14 +182,6 @@
184182
<FileId="Compiler_Redist_System.Reflection.Metadata.dll"Source="$(var.NugetPackagesDir)\System.Reflection.Metadata.1.4.2\lib\netstandard1.1\System.Reflection.Metadata.dll" />
185183
</Component>
186184

187-
<ComponentId="Compiler_Redist_Microsoft.DiaSymReader.PortablePdb.dll"Guid="$(fsharp.guid(Compiler_Redist_Microsoft.DiaSymReader.PortablePdb.dll, $(var.LocaleCode)))">
188-
<FileId="Compiler_Redist_Microsoft.DiaSymReader.PortablePdb.dll"Source="$(var.NugetPackagesDir)\Microsoft.DiaSymReader.PortablePdb.1.2.0\lib\netstandard1.1\Microsoft.DiaSymReader.PortablePdb.dll" />
189-
</Component>
190-
191-
<ComponentId="Compiler_Redist_Microsoft.DiaSymReader.dll"Guid="$(fsharp.guid(Compiler_Redist_Microsoft.DiaSymReader.dll, $(var.LocaleCode)))">
192-
<FileId="Compiler_Redist_Microsoft.DiaSymReader.dll"Source="$(var.NugetPackagesDir)\Microsoft.DiaSymReader.1.1.0\lib\netstandard1.1\Microsoft.DiaSymReader.dll" />
193-
</Component>
194-
195185
<ComponentId="Compiler_Redist_System.ValueTuple.dll"Guid="$(fsharp.guid(Compiler_Redist_System.ValueTuple.dll, $(var.LocaleCode)))">
196186
<FileId="Compiler_Redist_System.ValueTuple.dll"Source="$(var.NugetPackagesDir)\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll" />
197187
</Component>

‎setup/packages.config‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<packages>
33
<packageid="System.Collections.Immutable"version="1.3.1" />
44
<packageid="System.Reflection.Metadata"version="1.4.2" />
5-
<packageid="Microsoft.DiaSymReader.PortablePdb"version="1.2.0" />
6-
<packageid="Microsoft.DiaSymReader"version="1.1.0" />
75
<packageid="FsSrGen"version="2.0.0"targetFramework="net46" />
86
<packageid="MicroBuild.Core"version="0.2.0" />
97
<packageid="MicroBuild.Core.Sentinel"version="1.0.0" />

‎src/FSharpSource.Settings.targets‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@
9494
<MicrosoftVisualStudioThreadingVersion>15.3.23</MicrosoftVisualStudioThreadingVersion>
9595
<MicrosoftVisualStudioValidationVersion>15.3.15</MicrosoftVisualStudioValidationVersion>
9696

97-
<MicrosoftDiaSymReaderPackageVersion>1.1.0</MicrosoftDiaSymReaderPackageVersion>
98-
<MicrosoftDiaSymReaderPortablePdbPackageVersion>1.2.0</MicrosoftDiaSymReaderPortablePdbPackageVersion>
99-
10097
<!-- Frozen FSharp.Core package being built with this build-->
10198
<FSharpCore41TargetPackageVersion>4.1.19</FSharpCore41TargetPackageVersion>
10299
<FSharpCore41TargetMajorVersion>4.1</FSharpCore41TargetMajorVersion>

‎src/buildfromsource/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -638,8 +638,6 @@
638638
<PackageReferenceInclude="System.Threading.Tasks.Parallel"Version="$(SystemThreadingTasksParallelPackageVersion)" />
639639
<PackageReferenceInclude="System.Threading.Thread"Version="$(SystemThreadingThreadPackageVersion)" />
640640
<PackageReferenceInclude="System.Threading.ThreadPool"Version="$(SystemThreadingThreadPoolPackageVersion)" />
641-
<PackageReferenceInclude="Microsoft.DiaSymReader.PortablePdb"Version="$(MicrosoftDiaSymReaderPortablePdbPackageVersion)" />
642-
<PackageReferenceInclude="Microsoft.DiaSymReader"Version="$(MicrosoftDiaSymReaderPackageVersion)" />
643641
<PackageReferenceInclude="System.ValueTuple"Version="$(SystemValueTuplePackageVersion)" />
644642
</ItemGroup>
645643

‎src/buildfromsource/FSharp.Compiler.nuget/FSharp.Compiler.nuget.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<PackageTagsCondition="'$(PackageTags)' == ''" >Visual F# Compiler FSharp functional programming</PackageTags>
2222
<PreReleaseSuffixCondition="'$(PreRelease)' != 'false'">-rc-$(BuildRevision.Trim())-0</PreReleaseSuffix>
2323
<PackageVersion>10.1.1$(PreReleaseSuffix)</PackageVersion>
24-
<PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)" -prop "diasymreaderversion=$(MicrosoftDiaSymReaderPackageVersion)" -prop "diasymreaderportablepdbversion=$(MicrosoftDiaSymReaderPortablePdbPackageVersion)"</PackageProperties>
24+
<PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
2525
</PropertyGroup>
2626

2727
<PropertyGroup>
2828
<NuspecFile>$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.nuget\Microsoft.FSharp.Compiler.nuspec</NuspecFile>
29-
<NuspecProperties>licenseUrl=$(PackageLicenceUrl);version=$(PackageVersion);authors=$(PackageAuthors);projectUrl=$(PackageProjectUrl);tags=$(PackageTags);diasymreaderversion=$(MicrosoftDiaSymReaderPackageVersion);diasymreaderportablepdbversion=$(MicrosoftDiaSymReaderPortablePdbPackageVersion)</NuspecProperties>
29+
<NuspecProperties>licenseUrl=$(PackageLicenceUrl);version=$(PackageVersion);authors=$(PackageAuthors);projectUrl=$(PackageProjectUrl);tags=$(PackageTags)</NuspecProperties>
3030
<NuspecBasePath>$(OutputPath)/$(TargetFramework)</NuspecBasePath>
3131
</PropertyGroup>
3232

‎src/buildfromsource/targets/PackageVersions.props‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
<MicrosoftBuildFrameworkPackageVersion>15.1.548</MicrosoftBuildFrameworkPackageVersion>
2727
<MicrosoftBuildTasksCorePackageVersion>15.1.548</MicrosoftBuildTasksCorePackageVersion>
2828
<MicrosoftBuildUtilitiesCorePackageVersion>15.1.548</MicrosoftBuildUtilitiesCorePackageVersion>
29-
<MicrosoftDiaSymReaderPackageVersion>1.1.0</MicrosoftDiaSymReaderPackageVersion>
30-
<MicrosoftDiaSymReaderPortablePdbPackageVersion>1.2.0</MicrosoftDiaSymReaderPortablePdbPackageVersion>
3129
<MicrosoftWin32RegistryPackageVersion>4.3.0</MicrosoftWin32RegistryPackageVersion>
3230

3331
</PropertyGroup>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp