Skip to content

Commit 1591d71

Browse files
JoeRobichJoeRobich
authored
Merge pull request #57869 from dotnet/merges/main-to-main-vs-deps
Merge main to main-vs-deps
2 parents 94fc064 + ac09ff7 commit 1591d71

File tree

4 files changed

+14
-152
lines changed

4 files changed

+14
-152
lines changed

‎eng/Signing.props‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
<FileSignInfo Include="Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider.dll" PublicKeyToken="31bf3856ad364e35" TargetFramework=".NETFramework,Version=v2.0" CertificateName="MicrosoftWin8WinBlue"/>
2727
<FileSignInfo Include="Microsoft.CodeAnalysis.ExpressionEvaluator.FunctionResolver.dll" PublicKeyToken="31bf3856ad364e35" TargetFramework=".NETFramework,Version=v4.5" CertificateName="MicrosoftWin8WinBlue"/>
2828

29-
<FileSignInfo Include="System.Collections.Immutable.dll" CertificateName="Microsoft101240624"/>
30-
<FileSignInfo Include="System.Reflection.Metadata.dll" CertificateName="Microsoft101240624"/>
31-
3229
<!-- Sign 3rd party dlls with 3rd party cert -->
3330
<FileSignInfo Include="ICSharpCode.Decompiler.dll" CertificateName="3PartySHA2" />
3431
<FileSignInfo Include="e_sqlite3.dll" CertificateName="3PartySHA2" />

‎eng/config/OptProf.json‎

Lines changed: 1 addition & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,6 @@
252252
{
253253
"container": "TeamEng",
254254
"filteredTestCases": [
255-
{
256-
"filename": "/Contents/MSBuild/Current/Bin/Roslyn/System.Threading.Tasks.Extensions.dll",
257-
"testCases":[ "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble" ]
258-
},
259255
{
260256
"filename": "/Contents/MSBuild/Current/Bin/Roslyn/Microsoft.CodeAnalysis.CSharp.dll",
261257
"testCases":[ "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble" ]
@@ -268,31 +264,15 @@
268264
"filename": "/Contents/MSBuild/Current/Bin/Roslyn/Microsoft.CodeAnalysis.VisualBasic.dll",
269265
"testCases":[ "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble" ]
270266
},
271-
{
272-
"filename": "/Contents/MSBuild/Current/Bin/Roslyn/System.Memory.dll",
273-
"testCases":[ "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble" ]
274-
},
275-
{
276-
"filename": "/Contents/MSBuild/Current/Bin/Roslyn/System.Collections.Immutable.dll",
277-
"testCases":[ "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble" ]
278-
},
279267
{
280268
"filename": "/Contents/MSBuild/Current/Bin/Roslyn/VBCSCompiler.exe",
281269
"testCases":[ "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble" ]
282-
},
283-
{
284-
"filename": "/Contents/MSBuild/Current/Bin/Roslyn/System.Runtime.CompilerServices.Unsafe.dll",
285-
"testCases":[ "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble" ]
286270
}
287271
]
288272
},
289273
{
290274
"container": "VSPE",
291275
"filteredTestCases": [
292-
{
293-
"filename": "/Contents/MSBuild/Current/Bin/Roslyn/System.Threading.Tasks.Extensions.dll",
294-
"testCases":[ "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment", "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Debug" ]
295-
},
296276
{
297277
"filename": "/Contents/MSBuild/Current/Bin/Roslyn/Microsoft.CodeAnalysis.CSharp.dll",
298278
"testCases":[ "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment", "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Typing", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Debug" ]
@@ -301,126 +281,19 @@
301281
"filename": "/Contents/MSBuild/Current/Bin/Roslyn/Microsoft.CodeAnalysis.dll",
302282
"testCases":[ "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment", "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Typing", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Debug" ]
303283
},
304-
{
305-
"filename": "/Contents/MSBuild/Current/Bin/Roslyn/System.Text.Encoding.CodePages.dll",
306-
"testCases":[ "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment", "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Debug" ]
307-
},
308284
{
309285
"filename": "/Contents/MSBuild/Current/Bin/Roslyn/Microsoft.CodeAnalysis.VisualBasic.dll",
310286
"testCases":[ "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment", "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Debug" ]
311287
},
312-
{
313-
"filename": "/Contents/MSBuild/Current/Bin/Roslyn/System.Memory.dll",
314-
"testCases":[ "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment", "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Debug" ]
315-
},
316-
{
317-
"filename": "/Contents/MSBuild/Current/Bin/Roslyn/System.Collections.Immutable.dll",
318-
"testCases":[ "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment", "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Typing", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Debug" ]
319-
},
320288
{
321289
"filename": "/Contents/MSBuild/Current/Bin/Roslyn/VBCSCompiler.exe",
322290
"testCases":[ "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment", "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Debug" ]
323-
},
324-
{
325-
"filename": "/Contents/MSBuild/Current/Bin/Roslyn/System.Runtime.CompilerServices.Unsafe.dll",
326-
"testCases":[ "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment", "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Typing", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Debug" ]
327-
},
328-
{
329-
"filename": "/Contents/MSBuild/Current/Bin/Roslyn/System.Reflection.Metadata.dll",
330-
"testCases":[ "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment", "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Typing", "VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Debug" ]
331291
}
332292
]
333293
}
334294
]
335295
}
336296
],
337-
"assemblies": [
338-
{
339-
"assembly": "System.Collections.Immutable.dll",
340-
"instrumentationArguments": [
341-
{
342-
"relativeInstallationFolder": "Common7/IDE/PrivateAssemblies",
343-
"instrumentationExecutable": "Common7/IDE/vsn.exe"
344-
}
345-
],
346-
"tests": [
347-
{
348-
"container": "TeamEng",
349-
"testCases": [
350-
"TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble"
351-
]
352-
},
353-
{
354-
"container": "VSPE",
355-
"testCases": [
356-
"VSPE.OptProfTests.vs_asl_cs_scenario",
357-
"VSPE.OptProfTests.vs_asl_vb_scenario",
358-
"VSPE.OptProfTests.vs_ddbvtqa_vbwin",
359-
"VSPE.OptProfTests.vs_perf_designtime_editor_intellisense_globalcompletionlist_cs",
360-
"VSPE.OptProfTests.vs_perf_designtime_ide_searchtest",
361-
"VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment",
362-
"VSPE.OptProfTests.vs_perf_DesignTime_solution_loadclose_cs_picasso",
363-
"VSPE.OptProfTests.vs_perf_designtime_solution_loadclose_vb_australiangovernment",
364-
"VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Typing",
365-
"VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Debug"
366-
]
367-
},
368-
{
369-
"container": "WinForms",
370-
"testCases": [
371-
"WinForms.OptProfTests.winforms_largeform_vb"
372-
]
373-
},
374-
{
375-
"container": "XamlOptProf",
376-
"testCases": [
377-
"Microsoft.Test.Performance.XamlOptProfCreateTests.UwpCreateProject_SurfaceIsolated"
378-
]
379-
}
380-
]
381-
},
382-
{
383-
"assembly": "System.Reflection.Metadata.dll",
384-
"instrumentationArguments": [
385-
{
386-
"relativeInstallationFolder": "Common7/IDE/PrivateAssemblies",
387-
"instrumentationExecutable": "Common7/IDE/vsn.exe"
388-
}
389-
],
390-
"tests": [
391-
{
392-
"container": "TeamEng",
393-
"testCases": [
394-
"TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble"
395-
]
396-
},
397-
{
398-
"container": "VSPE",
399-
"testCases": [
400-
"VSPE.OptProfTests.vs_asl_cs_scenario",
401-
"VSPE.OptProfTests.vs_asl_vb_scenario",
402-
"VSPE.OptProfTests.vs_ddbvtqa_vbwin",
403-
"VSPE.OptProfTests.vs_perf_designtime_editor_intellisense_globalcompletionlist_cs",
404-
"VSPE.OptProfTests.vs_perf_designtime_ide_searchtest",
405-
"VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment",
406-
"VSPE.OptProfTests.vs_perf_designtime_solution_loadclose_vb_australiangovernment",
407-
"VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Typing",
408-
"VSPE.OptProfTests.DDRIT_RPS_ManagedLangs_Debug"
409-
]
410-
},
411-
{
412-
"container": "WinForms",
413-
"testCases": [
414-
"WinForms.OptProfTests.winforms_largeform_vb"
415-
]
416-
},
417-
{
418-
"container": "XamlOptProf",
419-
"testCases": [
420-
"Microsoft.Test.Performance.XamlOptProfCreateTests.UwpCreateProject_SurfaceIsolated"
421-
]
422-
}
423-
]
424-
}
297+
"assemblies": [
425298
]
426299
}

‎src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,23 +56,21 @@
5656
5757
We don't currently collect optimization data for the following assemblies.
5858
-->
59-
<_NoOptimizationData Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\System.Threading.Tasks.Extensions.dll"/>
6059
<_NoOptimizationData Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\System.Buffers.dll"/>
60+
<_NoOptimizationData Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\System.Collections.Immutable.dll"/>
6161
<_NoOptimizationData Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\System.Memory.dll"/>
6262
<_NoOptimizationData Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\System.Numerics.Vectors.dll"/>
63-
<_NoOptimizationData Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\System.Text.Encoding.CodePages.dll"/>
63+
<_NoOptimizationData Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\System.Reflection.Metadata.dll"/>
64+
<_NoOptimizationData Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\System.Runtime.CompilerServices.Unsafe.dll"/>
65+
<_NoOptimizationData Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\System.Text.Encoding.CodePages.dll"/>
66+
<_NoOptimizationData Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\System.Threading.Tasks.Extensions.dll"/>
6467

6568
<!--
6669
System.Numerics.Vector requires JIT, since its size is dynamic and based on the underlying CPU support.
6770
-->
6871
<_NoNGen Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\System.Numerics.Vectors.dll"/>
6972

70-
<DesktopCompilerArtifact Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\System.*.dll" Exclude="@(_NoOptimizationData)" NgenArchitecture="all" NgenApplication="VBCSCompiler.exe" OverwriteNgenOptimizationData="true"/>
71-
72-
<!-- Note: do not use Update attribute (see https://github.com/microsoft/msbuild/issues/1124) -->
73-
<DesktopCompilerArtifact NgenPriority="1" Condition="'%(Identity)' == '$(ArtifactsBinDir)csi\$(Configuration)\net472\System.Collections.Immutable.dll'" />
74-
<DesktopCompilerArtifact NgenPriority="1" Condition="'%(Identity)' == '$(ArtifactsBinDir)csi\$(Configuration)\net472\System.Reflection.Metadata.dll'" />
75-
73+
<DesktopCompilerArtifact Include="$(ArtifactsBinDir)csi\$(Configuration)\net472\System.*.dll" Exclude="@(_NoOptimizationData)" NgenArchitecture="all" NgenApplication="VBCSCompiler.exe" OverwriteNgenOptimizationData="true"/>
7674
<DesktopCompilerArtifact Include="@(_NoOptimizationData)" Exclude="@(_NoNGen)" NgenArchitecture="all" NgenApplication="VBCSCompiler.exe" OverwriteNgenOptimizationData="false"/>
7775
<DesktopCompilerArtifact Include="@(_NoNGen)" />
7876

‎src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.csproj‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,10 @@
5151
<ExpectedDependency Include="Microsoft.DiaSymReader"/>
5252
<ExpectedDependency Include="Microsoft.CodeAnalysis.Elfie"/>
5353
<ExpectedDependency Include="System.Buffers" />
54-
<ExpectedDependency Include="System.Collections.Immutable" OptimizeAssemblies="lib/netstandard2.0/System.Collections.Immutable.dll" UnsignAssemblies="lib/netstandard1.0/System.Collections.Immutable.dll" />
55-
<ExpectedDependency Include="System.Reflection.Metadata" OptimizeAssemblies="lib/netstandard2.0/System.Reflection.Metadata.dll" UnsignAssemblies="lib/netstandard1.1/System.Reflection.Metadata.dll" />
5654
<ExpectedDependency Include="System.Memory"/>
57-
<ExpectedDependency Include="System.Runtime.CompilerServices.Unsafe" OptimizeAssemblies="lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll" />
5855
<!-- We do not have a training scenario that covers lib/netstandard2.0/System.Text.Encoding.CodePages.dll -->
5956
<ExpectedDependency Include="System.Text.Encoding.CodePages" />
6057
<ExpectedDependency Include="System.Numerics.Vectors"/>
61-
<!--
62-
Do not overwrite optimization data for this binary for now.
63-
This assembly is signed by Open key in CoreFX and MicroBuild does not support this key.
64-
Arcade SignTool doesn't support signing directly at this point either.
65-
https://github.com/dotnet/arcade/issues/1204
66-
TODO: add OptimizeAssemblies="lib/netstandard2.0/System.Threading.Tasks.Extensions.dll"
67-
-->
68-
<ExpectedDependency Include="System.Threading.Tasks.Extensions" />
6958
</ItemGroup>
7059

7160
<Target Name="_CalculateDependenciesToInsert" DependsOnTargets="ResolveAssemblyReferences;GetAssemblyVersion">
@@ -136,14 +125,18 @@
136125
<_Dependency Remove="NuGet.VisualStudio.Contracts"/>
137126
<_Dependency Remove="stdole"/>
138127
<_Dependency Remove="StreamJsonRpc"/>
128+
<_Dependency Remove="System.Collections.Immutable"/>
139129
<_Dependency Remove="System.Diagnostics.DiagnosticSource"/>
140130
<_Dependency Remove="System.IO.Pipelines"/>
131+
<_Dependency Remove="System.Reflection.Metadata"/>
141132
<_Dependency Remove="System.Reflection.TypeExtensions"/>
133+
<_Dependency Remove="System.Runtime.CompilerServices.Unsafe"/>
142134
<_Dependency Remove="System.ValueTuple"/>
143135
<_Dependency Remove="System.Security.AccessControl"/>
144136
<_Dependency Remove="System.Security.Principal.Windows"/>
145137
<_Dependency Remove="System.Threading.AccessControl"/>
146138
<_Dependency Remove="System.Threading.Tasks.Dataflow"/>
139+
<_Dependency Remove="System.Threading.Tasks.Extensions" />
147140
<_Dependency Remove="VSLangProj"/>
148141
<_Dependency Remove="VSLangProj2"/>
149142
<_Dependency Remove="VSLangProj80"/>
@@ -261,14 +254,15 @@
261254
<MakeDir Directories="$(VisualStudioBuildPackagesDir)"/>
262255

263256
<!-- Unsign assemblies that need to be unsigned but not optimized. -->
264-
<Microsoft.DotNet.Arcade.Sdk.Unsign FilePath="%(_UnsignAssembly.Identity)" />
257+
<Microsoft.DotNet.Arcade.Sdk.Unsign FilePath="%(_UnsignAssembly.Identity)" Condition="'@(_UnsignAssembly)' != ''"/>
265258

266259
<!-- Repack optimized dependencies -->
267260
<Microsoft.DotNet.Tools.ReplacePackageParts SourcePackage="%(_PackageToRepack.Identity)"
268261
DestinationFolder="$(VisualStudioBuildPackagesDir)"
269262
NewVersionSuffix="$(_OptimizedNuGetPackageVersionSuffix)"
270263
Parts="%(_PackageToRepack.Parts)"
271-
ReplacementFiles="%(_PackageToRepack.ReplacementFiles)">
264+
ReplacementFiles="%(_PackageToRepack.ReplacementFiles)"
265+
Condition="'@(_PackageToRepack)' != ''">
272266
<Output TaskParameter="NewPackage" ItemName="FileWrites" />
273267
</Microsoft.DotNet.Tools.ReplacePackageParts>
274268

0 commit comments

Comments
 (0)