Skip to content
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.

Sign up for GitHub

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

Apply source-build patches #58727

Merged
merged 17 commits into from
Mar 15, 2022
Merged

Apply source-build patches #58727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
35d6ebc
lift version of Microsoft.CodeAnalysis.Common dependencies to previou…
lbussell Oct 21, 2021
a8ee96d
remove Microsoft.DotNet prebuilts
lbussell Oct 8, 2021
077fcca
Disable apphost build of 'csi', 'vbi' for source-build
dagood Oct 20, 2021
f3142bf
build a subset of roslyn projects
dseefeld Oct 22, 2021
f0d0e9a
change lifted package version names to refonly and set them if they a…
lbussell Jan 10, 2022
101eac5
remove unnecessary source-build conditions
lbussell Jan 10, 2022
912ab07
refactor CSharpSyntaxGenerator project to use Choose for targetframework
lbussell Jan 10, 2022
672e329
Revert "remove unnecessary source-build conditions"
lbussell Jan 12, 2022
8df52ca
Revert "build a subset of roslyn projects"
lbussell Jan 12, 2022
56dc22b
change RefOnly variable name prefixes back to SourceBuildLifted
lbussell Jan 20, 2022
3e570b5
update BuildBoss to allow new source build package version prefix
lbussell Jan 22, 2022
c91e00b
Merge branch 'main' into source-build-patches
lbussell Feb 7, 2022
b5bb06b
Merge branch 'main' into source-build-patches
lbussell Feb 15, 2022
35464c3
Merge branch 'main' into source-build-patches
lbussell Feb 19, 2022
caa111e
Revert changes for lifting some package versions for source-build
lbussell Feb 19, 2022
d3189c0
Merge branch 'main' into source-build-patches
lbussell Mar 3, 2022
ad01398
Merge branch 'main' into source-build-patches
lbussell Mar 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/Tools.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>

<ItemGroup>
<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ Why is Tools.props being included in sourcebuild? Can we exclude the file through some other means?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like it is included by Arcade: https://github.com/dotnet/arcade/blob/aa647dcfc48bd3a644625e549ff71b7d06ed0958/src/Microsoft.DotNet.Arcade.Sdk/tools/Tools.proj#L53

<!--
This package would normally be restored by the Arcade SDK, but it is not included during restore operations
if the -package flag is not also provided during the build. Roslyn separates the restore operation from the
Expand Down
1 change: 1 addition & 0 deletions src/Interactive/csi/csi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<OutputType>Exe</OutputType>
<RootNamespace>CSharpInteractive</RootNamespace>
<TargetFrameworks>net6.0;net472</TargetFrameworks>
<UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
</PropertyGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
Expand Down
1 change: 1 addition & 0 deletions src/Interactive/vbi/vbi.vbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<OutputType>Exe</OutputType>
<StartupObject>Sub Main</StartupObject>
<TargetFrameworks>net6.0;net472</TargetFrameworks>
<UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
<RootNamespace></RootNamespace>
</PropertyGroup>
<ItemGroup Label="Project References">
Expand Down