Skip to content

Commit d00771f

Browse files
MichaelSimonsMichaelSimons
authored
Enable the sdk and installer repos in source-build (#13846)
1 parent efef198 commit d00771f

File tree

7 files changed

+220
-25
lines changed

7 files changed

+220
-25
lines changed

‎src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,6 @@ jobs:
158158
fi
159159
160160
docker run --rm $dockerVolumeArgs -w /tarball $dockerEnvArgs $(_Container) ./build.sh $poisonArg --run-smoke-test $(additionalBuildArgs) -- /p:SmokeTestConsoleVerbosity=detailed
161-
# Disable smoke tests until more repos are building.
162-
condition: false
163161
displayName: Run Tests
164162
165163
# Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph.

‎src/SourceBuild/tarball/content/repos/installer.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:Rid=$(TargetRid)</BuildCommandArgs>
2626
<BuildCommandArgs>$(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir)</BuildCommandArgs>
2727

28-
<BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-$(Platform)</BuildCommandArgs>
28+
<BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreInstallerRid=linux-$(Platform)</BuildCommandArgs>
2929
<!-- core-sdk always wants to build portable on OSX and FreeBSD -->
3030
<BuildCommandArgs Condition="'$(TargetOS)' == 'FreeBSD'">$(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true</BuildCommandArgs>
3131
<BuildCommandArgs Condition="'$(TargetOS)' == 'OSX'">$(BuildCommandArgs) /p:CoreSetupRid=osx-x64</BuildCommandArgs>

‎src/SourceBuild/tarball/content/repos/known-good.proj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@
5959

6060
<!-- Tier 5 -->
6161
<RepositoryReference Include="fsharp" />
62-
<!-- <RepositoryReference Include="sdk" /> -->
62+
<RepositoryReference Include="sdk" />
6363
<RepositoryReference Include="vstest" />
6464

6565
<!-- Tier 6 -->
66-
<!-- <RepositoryReference Include="installer" /> -->
66+
<RepositoryReference Include="installer" />
6767

6868
<!-- Package source-build artifacts -->
6969
<RepositoryReference Include="package-source-build" />

‎src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt‎

Lines changed: 113 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,153 @@
11
Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml
22
Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml
3+
Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.Components.Analyzers.xml
34
Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml
45
Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml
5-
Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.xml
6+
Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.RegularExpressions.Generator.xml
7+
Microsoft.NETCore.App.Ref/analyzers/dotnet/Microsoft.Interop.LibraryImportGenerator.xml
8+
Microsoft.NETCore.App.Ref/analyzers/dotnet/Microsoft.Interop.SourceGeneration.xml
9+
Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.CSharp.xml
10+
Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.Core.xml
11+
Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.Win32.Primitives.xml
12+
Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.Win32.Registry.xml
613
Microsoft.NETCore.App.Ref/ref/netx.y/mscorlib.xml
714
Microsoft.NETCore.App.Ref/ref/netx.y/System.AppContext.xml
815
Microsoft.NETCore.App.Ref/ref/netx.y/System.Buffers.xml
9-
Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.DataAnnotations.xml
10-
Microsoft.NETCore.App.Ref/ref/netx.y/System.Configuration.xml
11-
Microsoft.NETCore.App.Ref/ref/netx.y/System.Core.xml
16+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Collections.Concurrent.xml
17+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Collections.Immutable.xml
18+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Collections.NonGeneric.xml
19+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Collections.Specialized.xml
20+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Collections.xml
21+
Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.Annotations.xml
22+
Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.EventBasedAsync.xml
23+
Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.Primitives.xml
24+
Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.TypeConverter.xml
25+
Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.xml
26+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Console.xml
27+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Data.Common.xml
1228
Microsoft.NETCore.App.Ref/ref/netx.y/System.Data.DataSetExtensions.xml
1329
Microsoft.NETCore.App.Ref/ref/netx.y/System.Data.xml
30+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Contracts.xml
1431
Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Debug.xml
32+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.DiagnosticSource.xml
33+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.FileVersionInfo.xml
34+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Process.xml
35+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.StackTrace.xml
36+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.TextWriterTraceListener.xml
1537
Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Tools.xml
16-
Microsoft.NETCore.App.Ref/ref/netx.y/System.Drawing.xml
38+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.TraceSource.xml
39+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Tracing.xml
40+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Drawing.Primitives.xml
1741
Microsoft.NETCore.App.Ref/ref/netx.y/System.Dynamic.Runtime.xml
42+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Formats.Asn1.xml
43+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Formats.Tar.xml
1844
Microsoft.NETCore.App.Ref/ref/netx.y/System.Globalization.Calendars.xml
1945
Microsoft.NETCore.App.Ref/ref/netx.y/System.Globalization.Extensions.xml
2046
Microsoft.NETCore.App.Ref/ref/netx.y/System.Globalization.xml
2147
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Compression.Brotli.xml
22-
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Compression.FileSystem.xml
48+
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Compression.xml
49+
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Compression.ZipFile.xml
50+
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.AccessControl.xml
51+
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.DriveInfo.xml
2352
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.Primitives.xml
53+
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.Watcher.xml
2454
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.xml
55+
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.IsolatedStorage.xml
56+
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.MemoryMappedFiles.xml
57+
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Pipes.AccessControl.xml
58+
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Pipes.xml
2559
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.UnmanagedMemoryStream.xml
2660
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.xml
27-
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.xml
61+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Linq.Expressions.xml
62+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Linq.Parallel.xml
63+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Linq.Queryable.xml
64+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Linq.xml
65+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Memory.xml
66+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Http.Json.xml
67+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Http.xml
68+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.HttpListener.xml
69+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Mail.xml
70+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.NameResolution.xml
71+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.NetworkInformation.xml
72+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Ping.xml
73+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Primitives.xml
74+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Requests.xml
75+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Security.xml
76+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.ServicePoint.xml
77+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Sockets.xml
78+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.WebClient.xml
79+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.WebHeaderCollection.xml
80+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.WebProxy.xml
81+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.WebSockets.Client.xml
82+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.WebSockets.xml
2883
Microsoft.NETCore.App.Ref/ref/netx.y/System.Numerics.Vectors.xml
29-
Microsoft.NETCore.App.Ref/ref/netx.y/System.Numerics.xml
84+
Microsoft.NETCore.App.Ref/ref/netx.y/System.ObjectModel.xml
85+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.DispatchProxy.xml
86+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Emit.ILGeneration.xml
87+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Emit.Lightweight.xml
88+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Emit.xml
3089
Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Extensions.xml
90+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Metadata.xml
91+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Primitives.xml
92+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.TypeExtensions.xml
3193
Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.xml
3294
Microsoft.NETCore.App.Ref/ref/netx.y/System.Resources.Reader.xml
3395
Microsoft.NETCore.App.Ref/ref/netx.y/System.Resources.ResourceManager.xml
96+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Resources.Writer.xml
97+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml
98+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.VisualC.xml
3499
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Extensions.xml
35100
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Handles.xml
36-
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Serialization.xml
101+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.InteropServices.RuntimeInformation.xml
102+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.InteropServices.xml
103+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Intrinsics.xml
104+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Loader.xml
105+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Numerics.xml
106+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Serialization.Formatters.xml
107+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Serialization.Json.xml
108+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Serialization.Primitives.xml
109+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Serialization.Xml.xml
110+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.xml
111+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.AccessControl.xml
112+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Claims.xml
113+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.Algorithms.xml
114+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.Cng.xml
115+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.Csp.xml
116+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.Encoding.xml
117+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.OpenSsl.xml
118+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.Primitives.xml
119+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.X509Certificates.xml
120+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.xml
121+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Principal.Windows.xml
37122
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Principal.xml
38123
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.SecureString.xml
39-
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.xml
40-
Microsoft.NETCore.App.Ref/ref/netx.y/System.ServiceModel.Web.xml
41-
Microsoft.NETCore.App.Ref/ref/netx.y/System.ServiceProcess.xml
124+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.Encoding.CodePages.xml
125+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.Encoding.Extensions.xml
42126
Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.Encoding.xml
127+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.Encodings.Web.xml
128+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.Json.xml
129+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.RegularExpressions.xml
130+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Channels.xml
131+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Overlapped.xml
132+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Tasks.Dataflow.xml
43133
Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Tasks.Extensions.xml
134+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Tasks.Parallel.xml
44135
Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Tasks.xml
136+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Thread.xml
137+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.ThreadPool.xml
45138
Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Timer.xml
46-
Microsoft.NETCore.App.Ref/ref/netx.y/System.Transactions.xml
139+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.xml
140+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Transactions.Local.xml
47141
Microsoft.NETCore.App.Ref/ref/netx.y/System.ValueTuple.xml
48-
Microsoft.NETCore.App.Ref/ref/netx.y/System.Web.xml
49-
Microsoft.NETCore.App.Ref/ref/netx.y/System.Windows.xml
142+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Web.HttpUtility.xml
50143
Microsoft.NETCore.App.Ref/ref/netx.y/System.xml
51-
Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.Linq.xml
52-
Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.Serialization.xml
144+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.ReaderWriter.xml
145+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.XDocument.xml
53146
Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.xml
54147
Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.XmlDocument.xml
55-
Microsoft.NETCore.App.Ref/ref/netx.y/WindowsBase.xml
148+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.XmlSerializer.xml
149+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.XPath.XDocument.xml
150+
Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.XPath.xml
56151
NETStandard.Library.Ref/ref/netstandard2.1/Microsoft.Win32.Primitives.xml
57152
NETStandard.Library.Ref/ref/netstandard2.1/mscorlib.xml
58153
NETStandard.Library.Ref/ref/netstandard2.1/System.AppContext.xml

‎src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<packageSources>
44
<clear />
55
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
6-
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
7-
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
6+
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
7+
<add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
88
</packageSources>
99
</configuration>

‎src/SourceBuild/tarball/patches/fsharp/0002-Add-Microsoft.FSharp.Compiler-to-source-build.patch‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: MichaelSimons <[email protected]>
3+
Date: Mon, 23 May 2022 19:09:18 +0000
4+
Subject: [PATCH] Add Microsoft.FSharp.Compiler to source-build
5+
6+
Backport issue: Tracking issue: https://github.com/dotnet/fsharp/issues/13174
7+
---
8+
eng/SourceBuild.props | 17 +----------------
9+
.../Microsoft.FSharp.Compiler.csproj | 16 ++++++++++++++++
10+
2 files changed, 17 insertions(+), 16 deletions(-)
11+
12+
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
13+
index 903ee00d3..b8402e043 100644
14+
--- a/eng/SourceBuild.props
15+
+++ b/eng/SourceBuild.props
16+
@@ -5,28 +5,13 @@
17+
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
18+
</PropertyGroup>
19+
20+
- <Target Name="ApplySourceBuildPatchFiles"
21+
- Condition="
22+
- '$(ArcadeBuildFromSource)' == 'true' and
23+
- '$(ArcadeInnerBuildFromSource)' == 'true'"
24+
- BeforeTargets="Execute">
25+
- <ItemGroup>
26+
- <SourceBuildPatchFile Include="$(RepositoryEngineeringDir)source-build-patches\*.patch" />
27+
- </ItemGroup>
28+
-
29+
- <Exec
30+
- Command="git apply --ignore-whitespace --whitespace=nowarn &quot;%(SourceBuildPatchFile.FullPath)&quot;"
31+
- WorkingDirectory="$(RepoRoot)"
32+
- Condition="'@(SourceBuildPatchFile)' != ''" />
33+
- </Target>
34+
-
35+
<!--
36+
The build script passes in the full path of the sln to build. This must be overridden in order to build
37+
the cloned source in the inner build.
38+
-->
39+
<Target Name="ConfigureInnerBuildArg" BeforeTargets="GetSourceBuildCommandConfiguration">
40+
<PropertyGroup>
41+
- <InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\FSharp.sln"</InnerBuildArgs>
42+
+ <InnerBuildArgs>$(InnerBuildArgs) '/p:Projects="$(InnerSourceBuildRepoRoot)\FSharp.sln;$(InnerSourceBuildRepoRoot)\Microsoft.FSharp.Compiler.sln"'</InnerBuildArgs>
43+
</PropertyGroup>
44+
</Target>
45+
46+
diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj
47+
index eaeac80f3..417beac4e 100644
48+
--- a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj
49+
+++ b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj
50+
@@ -9,8 +9,24 @@
51+
<PackageDescription>.NET Core compatible version of the F# compiler fsc.exe.</PackageDescription>
52+
<PackageReleaseNotes>/blob/main/release-notes.md#FSharp-Tools-$(FSProductVersionReleaseNotesVersion)</PackageReleaseNotes>
53+
<NoDefaultExcludes>true</NoDefaultExcludes>
54+
+ <ShouldUnsetParentConfigurationAndPlatform>false</ShouldUnsetParentConfigurationAndPlatform>
55+
</PropertyGroup>
56+
57+
+ <ItemGroup>
58+
+ <ProjectReference Include="..\fsc\fsc.fsproj">
59+
+ <AdditionalProperties>TargetFramework=net6.0</AdditionalProperties>
60+
+ </ProjectReference>
61+
+ <ProjectReference Include="..\fsi\fsi.fsproj">
62+
+ <AdditionalProperties>TargetFramework=net6.0</AdditionalProperties>
63+
+ </ProjectReference>
64+
+ <ProjectReference Include="..\FSharp.Build\FSharp.Build.fsproj" Targets="Restore;Build;Pack">
65+
+ <AdditionalProperties>TargetFramework=netstandard2.0</AdditionalProperties>
66+
+ </ProjectReference>
67+
+ <ProjectReference Include="..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" Targets="Restore;Build;Pack">
68+
+ <AdditionalProperties>TargetFramework=netstandard2.0</AdditionalProperties>
69+
+ </ProjectReference>
70+
+ </ItemGroup>
71+
+
72+
<ItemGroup>
73+
<NuspecProperty Include="fSharpCorePreviewPackageVersion=$(FSCorePackageVersionValue)-$(VersionSuffix)" />
74+
<NuspecProperty Include="fSharpCorePackageVersion=$(FSCorePackageVersionValue)" />

0 commit comments

Comments
 (0)