-
Notifications
You must be signed in to change notification settings - Fork 4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rebuild as many projects as possible #51427
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
cce1bfa
Rebuild as many projects as possible
RikkiGibson 99c967c
Rebuild with release bootstrap compiler
RikkiGibson 32be040
don't rebuild net472 yet
RikkiGibson da70de1
cleanup
RikkiGibson cab3f6f
Temporarily move back to vmImage
RikkiGibson e5fd46e
remove failing
RikkiGibson 81c20b7
embed ildasm
RikkiGibson 884a9c1
use helix queue
RikkiGibson 4e58ed7
Merge branch 'master' of github.com:dotnet/roslyn into rebuild-more
RikkiGibson b948154
public -> internal IldasmUtilities
RikkiGibson File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. --> | ||
<Project> | ||
<!-- | ||
This logic is adding the ILDASM executable to the runtime directory of all projects that include | ||
this target file. The build provenance tools need this to decompile IL for debugging purposes. | ||
--> | ||
<ItemGroup> | ||
<Content Include="$(NuGetPackageRoot)\runtime.win-x64.microsoft.netcore.ildasm\$(runtimeWinX64MicrosoftNETCoreILDAsmPackageVersion)\runtimes\**\*.*"> | ||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
<LinkBase>runtimes</LinkBase> | ||
<Visible>false</Visible> | ||
<Pack>false</Pack> | ||
</Content> | ||
<Content Include="$(NuGetPackageRoot)\runtime.linux-x64.microsoft.netcore.ildasm\$(runtimeLinuxX64MicrosoftNETCoreILDAsmPackageVersion)\runtimes\**\*.*"> | ||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
<LinkBase>runtimes</LinkBase> | ||
<Visible>false</Visible> | ||
<Pack>false</Pack> | ||
</Content> | ||
<Content Include="$(NuGetPackageRoot)\runtime.osx-x64.microsoft.netcore.ildasm\$(runtimeOSXX64MicrosoftNETCoreILDAsmPackageVersion)\runtimes\**\*.*"> | ||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
<LinkBase>runtimes</LinkBase> | ||
<Visible>false</Visible> | ||
<Pack>false</Pack> | ||
</Content> | ||
|
||
<PackageReference Include="runtime.win-x64.Microsoft.NETCore.ILDAsm" Version="$(runtimeWinX64MicrosoftNETCoreILDAsmPackageVersion)" ExcludeAssets="all" /> | ||
<PackageReference Include="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="$(runtimeLinuxX64MicrosoftNETCoreILDAsmPackageVersion)" ExcludeAssets="all" /> | ||
<PackageReference Include="runtime.osx-x64.Microsoft.NETCore.ILDAsm" Version="$(runtimeOSXX64MicrosoftNETCoreILDAsmPackageVersion)" ExcludeAssets="all" /> | ||
</ItemGroup> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -36,13 +36,45 @@ try { | |
|
||
$dotnetInstallDir = (InitializeDotNetCli -install:$true) | ||
$rebuildArgs = ("--verbose" + | ||
" --assembliesPath `"$ArtifactsDir/obj/Microsoft.CodeAnalysis/$configuration`"" + | ||
" --assembliesPath $ArtifactsDir/obj/csc/$configuration/netcoreapp3.1" + | ||
" --assembliesPath `"$ArtifactsDir/obj/AnalyzerRunner/$configuration/netcoreapp3.1`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/AnalyzerRunner/$configuration/net5.0`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/CodeStyleConfigFileGenerator`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/csc/$configuration/netcoreapp3.1`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/CSharpResultProvider.NetFX20`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/CSharpSyntaxGenerator`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/csi/$configuration/netcoreapp3.1`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/IdeCoreBenchmarks/$configuration/netcoreapp3.1`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/IdeCoreBenchmarks/$configuration/net5.0`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/Microsoft.CodeAnalysis`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/Microsoft.CodeAnalysis.CodeStyle`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/Microsoft.CodeAnalysis.CodeStyle.Fixes`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/Microsoft.CodeAnalysis.Compiler.Test.Resources`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/Microsoft.CodeAnalysis.CSharp`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/Microsoft.CodeAnalysis.CSharp.CodeStyle`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/Microsoft.CodeAnalysis.CSharp.ExpressionCompiler`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/Microsoft.CodeAnalysis.CSharp.Features`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/Microsoft.CodeAnalysis.CSharp.Workspaces`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/Microsoft.CodeAnalysis.EditorFeatures.Text`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/Microsoft.CodeAnalysis.ExpressionCompiler`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/Microsoft.CodeAnalysis.ExternalAccess.Debugger`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/Microsoft.CodeAnalysis.ExternalAccess.Razor`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/Microsoft.CodeAnalysis.Remote.Razor.ServiceHub`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/Microsoft.CodeAnalysis.Remote.Workspaces`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/Microsoft.CodeAnalysis.ResultProvider`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/Microsoft.CodeAnalysis.Scripting`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/Microsoft.CodeAnalysis.Scripting.TestUtilities`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/Microsoft.CodeAnalysis.TestSourceGenerator`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/Microsoft.CodeAnalysis.Workspaces`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/PrepareTests`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/RunTests`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/vbc/$configuration/netcoreapp3.1`"" + | ||
" --assembliesPath `"$ArtifactsDir/obj/VBCSCompiler/$configuration/netcoreapp3.1`"" + | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
|
||
" --debugPath `"$ArtifactsDir/BuildValidator`"" + | ||
" --sourcePath `"$RepoRoot`"" + | ||
" --referencesPath `"$ArtifactsDir/bin`"" + | ||
" --referencesPath `"$dotnetInstallDir/packs/Microsoft.AspNetCore.App.Ref`"" + | ||
" --referencesPath `"$dotnetInstallDir/packs/Microsoft.NETCore.App.Ref`"") | ||
" --referencesPath `"$dotnetInstallDir/packs`"") | ||
Exec-Console "$ArtifactsDir/bin/BuildValidator/$configuration/net472/BuildValidator.exe" $rebuildArgs | ||
|
||
exit 0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
// See the LICENSE file in the project root for more information. | ||
|
||
using System; | ||
using System.IO; | ||
using System.Reflection; | ||
using System.Runtime.InteropServices; | ||
using Roslyn.Utilities; | ||
|
||
namespace BuildValidator | ||
{ | ||
internal static class IldasmUtilities | ||
{ | ||
private static string GetIldasmPath() | ||
{ | ||
var ildasmExeName = PlatformInformation.IsWindows ? "ildasm.exe" : "ildasm"; | ||
var directory = Path.GetDirectoryName(typeof(IldasmUtilities).GetTypeInfo().Assembly.Location) ?? throw new DirectoryNotFoundException(); | ||
string ridName; | ||
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) | ||
{ | ||
ridName = "win-x64"; | ||
} | ||
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) | ||
{ | ||
ridName = "osx-x64"; | ||
} | ||
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) | ||
{ | ||
ridName = "linux-x64"; | ||
} | ||
else | ||
{ | ||
throw new PlatformNotSupportedException("Runtime platform not supported for testing"); | ||
} | ||
|
||
return Path.Combine(directory, "runtimes", ridName, "native", ildasmExeName); | ||
} | ||
|
||
internal static readonly string IldasmPath = GetIldasmPath(); | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are we using different versions here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When I tried using the same, original version for both, NuGet complained me that it couldn’t find such a version of ildasm and chose the version that you see instead.