Enable the sdk and installer repos in source-build (#13846)
This commit is contained in:
Michael Simons
GitHub
parent
efef198ecc
commit
d00771f511
7 changed files with 220 additions and 25 deletions
|
|
@ -158,8 +158,6 @@ jobs:
|
|||
fi
|
||||
|
||||
docker run --rm $dockerVolumeArgs -w /tarball $dockerEnvArgs $(_Container) ./build.sh $poisonArg --run-smoke-test $(additionalBuildArgs) -- /p:SmokeTestConsoleVerbosity=detailed
|
||||
# Disable smoke tests until more repos are building.
|
||||
condition: false
|
||||
displayName: Run Tests
|
||||
|
||||
# Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph.
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:Rid=$(TargetRid)</BuildCommandArgs>
|
||||
<BuildCommandArgs>$(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir)</BuildCommandArgs>
|
||||
|
||||
<BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-$(Platform)</BuildCommandArgs>
|
||||
<BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreInstallerRid=linux-$(Platform)</BuildCommandArgs>
|
||||
<!-- core-sdk always wants to build portable on OSX and FreeBSD -->
|
||||
<BuildCommandArgs Condition="'$(TargetOS)' == 'FreeBSD'">$(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true</BuildCommandArgs>
|
||||
<BuildCommandArgs Condition="'$(TargetOS)' == 'OSX'">$(BuildCommandArgs) /p:CoreSetupRid=osx-x64</BuildCommandArgs>
|
||||
|
|
|
|||
|
|
@ -59,11 +59,11 @@
|
|||
|
||||
<!-- Tier 5 -->
|
||||
<RepositoryReference Include="fsharp" />
|
||||
<!-- <RepositoryReference Include="sdk" /> -->
|
||||
<RepositoryReference Include="sdk" />
|
||||
<RepositoryReference Include="vstest" />
|
||||
|
||||
<!-- Tier 6 -->
|
||||
<!-- <RepositoryReference Include="installer" /> -->
|
||||
<RepositoryReference Include="installer" />
|
||||
|
||||
<!-- Package source-build artifacts -->
|
||||
<RepositoryReference Include="package-source-build" />
|
||||
|
|
|
|||
|
|
@ -1,58 +1,153 @@
|
|||
Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml
|
||||
Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml
|
||||
Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.Components.Analyzers.xml
|
||||
Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml
|
||||
Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.xml
|
||||
Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.RegularExpressions.Generator.xml
|
||||
Microsoft.NETCore.App.Ref/analyzers/dotnet/Microsoft.Interop.LibraryImportGenerator.xml
|
||||
Microsoft.NETCore.App.Ref/analyzers/dotnet/Microsoft.Interop.SourceGeneration.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.CSharp.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.Core.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.Win32.Primitives.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.Win32.Registry.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/mscorlib.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.AppContext.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Buffers.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.DataAnnotations.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Configuration.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Core.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Collections.Concurrent.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Collections.Immutable.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Collections.NonGeneric.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Collections.Specialized.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Collections.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.Annotations.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.EventBasedAsync.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.Primitives.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.TypeConverter.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Console.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Data.Common.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Data.DataSetExtensions.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Data.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Contracts.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Debug.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.DiagnosticSource.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.FileVersionInfo.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Process.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.StackTrace.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.TextWriterTraceListener.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Tools.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Drawing.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.TraceSource.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Tracing.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Drawing.Primitives.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Dynamic.Runtime.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Formats.Asn1.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Formats.Tar.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Globalization.Calendars.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Globalization.Extensions.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Globalization.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Compression.Brotli.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Compression.FileSystem.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Compression.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Compression.ZipFile.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.AccessControl.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.DriveInfo.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.Primitives.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.Watcher.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.IsolatedStorage.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.MemoryMappedFiles.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Pipes.AccessControl.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Pipes.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.UnmanagedMemoryStream.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Linq.Expressions.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Linq.Parallel.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Linq.Queryable.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Linq.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Memory.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Http.Json.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Http.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.HttpListener.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Mail.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.NameResolution.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.NetworkInformation.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Ping.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Primitives.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Requests.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Security.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.ServicePoint.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.Sockets.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.WebClient.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.WebHeaderCollection.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.WebProxy.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.WebSockets.Client.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.WebSockets.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Numerics.Vectors.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Numerics.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.ObjectModel.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.DispatchProxy.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Emit.ILGeneration.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Emit.Lightweight.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Emit.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Extensions.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Metadata.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Primitives.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.TypeExtensions.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Resources.Reader.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Resources.ResourceManager.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Resources.Writer.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.VisualC.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Extensions.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Handles.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Serialization.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.InteropServices.RuntimeInformation.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.InteropServices.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Intrinsics.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Loader.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Numerics.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Serialization.Formatters.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Serialization.Json.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Serialization.Primitives.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Serialization.Xml.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.AccessControl.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Claims.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.Algorithms.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.Cng.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.Csp.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.Encoding.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.OpenSsl.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.Primitives.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.X509Certificates.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Cryptography.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Principal.Windows.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Principal.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.SecureString.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.ServiceModel.Web.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.ServiceProcess.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.Encoding.CodePages.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.Encoding.Extensions.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.Encoding.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.Encodings.Web.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.Json.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.RegularExpressions.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Channels.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Overlapped.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Tasks.Dataflow.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Tasks.Extensions.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Tasks.Parallel.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Tasks.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Thread.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.ThreadPool.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Timer.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Transactions.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Transactions.Local.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.ValueTuple.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Web.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Windows.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Web.HttpUtility.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.Linq.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.Serialization.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.ReaderWriter.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.XDocument.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.XmlDocument.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/WindowsBase.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.XmlSerializer.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.XPath.XDocument.xml
|
||||
Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.XPath.xml
|
||||
NETStandard.Library.Ref/ref/netstandard2.1/Microsoft.Win32.Primitives.xml
|
||||
NETStandard.Library.Ref/ref/netstandard2.1/mscorlib.xml
|
||||
NETStandard.Library.Ref/ref/netstandard2.1/System.AppContext.xml
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<packageSources>
|
||||
<clear />
|
||||
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
|
||||
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
|
||||
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
|
||||
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
|
||||
<add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
|
||||
</packageSources>
|
||||
</configuration>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,74 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MichaelSimons <msimons@microsoft.com>
|
||||
Date: Mon, 23 May 2022 19:09:18 +0000
|
||||
Subject: [PATCH] Add Microsoft.FSharp.Compiler to source-build
|
||||
|
||||
Backport issue: Tracking issue: https://github.com/dotnet/fsharp/issues/13174
|
||||
---
|
||||
eng/SourceBuild.props | 17 +----------------
|
||||
.../Microsoft.FSharp.Compiler.csproj | 16 ++++++++++++++++
|
||||
2 files changed, 17 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
|
||||
index 903ee00d3..b8402e043 100644
|
||||
--- a/eng/SourceBuild.props
|
||||
+++ b/eng/SourceBuild.props
|
||||
@@ -5,28 +5,13 @@
|
||||
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
|
||||
</PropertyGroup>
|
||||
|
||||
- <Target Name="ApplySourceBuildPatchFiles"
|
||||
- Condition="
|
||||
- '$(ArcadeBuildFromSource)' == 'true' and
|
||||
- '$(ArcadeInnerBuildFromSource)' == 'true'"
|
||||
- BeforeTargets="Execute">
|
||||
- <ItemGroup>
|
||||
- <SourceBuildPatchFile Include="$(RepositoryEngineeringDir)source-build-patches\*.patch" />
|
||||
- </ItemGroup>
|
||||
-
|
||||
- <Exec
|
||||
- Command="git apply --ignore-whitespace --whitespace=nowarn "%(SourceBuildPatchFile.FullPath)""
|
||||
- WorkingDirectory="$(RepoRoot)"
|
||||
- Condition="'@(SourceBuildPatchFile)' != ''" />
|
||||
- </Target>
|
||||
-
|
||||
<!--
|
||||
The build script passes in the full path of the sln to build. This must be overridden in order to build
|
||||
the cloned source in the inner build.
|
||||
-->
|
||||
<Target Name="ConfigureInnerBuildArg" BeforeTargets="GetSourceBuildCommandConfiguration">
|
||||
<PropertyGroup>
|
||||
- <InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\FSharp.sln"</InnerBuildArgs>
|
||||
+ <InnerBuildArgs>$(InnerBuildArgs) '/p:Projects="$(InnerSourceBuildRepoRoot)\FSharp.sln;$(InnerSourceBuildRepoRoot)\Microsoft.FSharp.Compiler.sln"'</InnerBuildArgs>
|
||||
</PropertyGroup>
|
||||
</Target>
|
||||
|
||||
diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj
|
||||
index eaeac80f3..417beac4e 100644
|
||||
--- a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj
|
||||
+++ b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.csproj
|
||||
@@ -9,8 +9,24 @@
|
||||
<PackageDescription>.NET Core compatible version of the F# compiler fsc.exe.</PackageDescription>
|
||||
<PackageReleaseNotes>/blob/main/release-notes.md#FSharp-Tools-$(FSProductVersionReleaseNotesVersion)</PackageReleaseNotes>
|
||||
<NoDefaultExcludes>true</NoDefaultExcludes>
|
||||
+ <ShouldUnsetParentConfigurationAndPlatform>false</ShouldUnsetParentConfigurationAndPlatform>
|
||||
</PropertyGroup>
|
||||
|
||||
+ <ItemGroup>
|
||||
+ <ProjectReference Include="..\fsc\fsc.fsproj">
|
||||
+ <AdditionalProperties>TargetFramework=net6.0</AdditionalProperties>
|
||||
+ </ProjectReference>
|
||||
+ <ProjectReference Include="..\fsi\fsi.fsproj">
|
||||
+ <AdditionalProperties>TargetFramework=net6.0</AdditionalProperties>
|
||||
+ </ProjectReference>
|
||||
+ <ProjectReference Include="..\FSharp.Build\FSharp.Build.fsproj" Targets="Restore;Build;Pack">
|
||||
+ <AdditionalProperties>TargetFramework=netstandard2.0</AdditionalProperties>
|
||||
+ </ProjectReference>
|
||||
+ <ProjectReference Include="..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" Targets="Restore;Build;Pack">
|
||||
+ <AdditionalProperties>TargetFramework=netstandard2.0</AdditionalProperties>
|
||||
+ </ProjectReference>
|
||||
+ </ItemGroup>
|
||||
+
|
||||
<ItemGroup>
|
||||
<NuspecProperty Include="fSharpCorePreviewPackageVersion=$(FSCorePackageVersionValue)-$(VersionSuffix)" />
|
||||
<NuspecProperty Include="fSharpCorePackageVersion=$(FSCorePackageVersionValue)" />
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MichaelSimons <msimons@microsoft.com>
|
||||
Date: Tue, 17 May 2022 23:23:42 +0000
|
||||
Subject: [PATCH] Update to handle Microsoft.FSharp.Compiler to handle no NuGet repack support in source-build
|
||||
|
||||
Tracking issue: https://github.com/dotnet/source-build/issues/2873
|
||||
---
|
||||
.../Microsoft.FSharp.Compiler.nuspec | 7 ++-----
|
||||
1 files changed, 2 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec
|
||||
index ee67b15c5..b3f926f2f 100644
|
||||
--- a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec
|
||||
+++ b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec
|
||||
@@ -54,11 +54,8 @@
|
||||
<file src="FSharp.Build\$Configuration$\netstandard2.0\**\FSharp.Build.resources.dll" target="lib\net6.0" />
|
||||
<file src="FSharp.DependencyManager.Nuget\$configuration$\netstandard2.0\**\FSharp.DependencyManager.Nuget.resources.dll"
|
||||
target="lib\net6.0" />
|
||||
- <file src="$artifactsPackagesDir$Shipping\FSharp.Core.$fSharpCorePreviewPackageVersion$*nupkg" target="contentFiles\Shipping" />
|
||||
- <file src="$artifactsPackagesDir$Release\FSharp.Core.$fSharpCorePackageVersion$*nupkg" target="contentFiles\Release" />
|
||||
- <file src="$artifactsPackagesDir$Shipping\FSharp.Compiler.Service.$fSharpCompilerServicePreviewPackageVersion$*nupkg"
|
||||
- target="contentFiles\Shipping" />
|
||||
- <file src="$artifactsPackagesDir$Release\FSharp.Compiler.Service.$fSharpCompilerServicePackageVersion$*nupkg"
|
||||
+ <file src="$artifactsPackagesDir$\FSharp.Core.$fSharpCorePackageVersion$*nupkg" target="contentFiles\Release" />
|
||||
+ <file src="$artifactsPackagesDir$\FSharp.Compiler.Service.$fSharpCompilerServicePackageVersion$*nupkg"
|
||||
target="contentFiles\Release" />
|
||||
<file src="FSharp.Build\$Configuration$\netstandard2.0\Shipping\Microsoft.FSharp.Core.NetSdk.props"
|
||||
target="contentFiles\Shipping" />
|
||||
Loading…
Add table
Add a link
Reference in a new issue