Skip to content

Commit 314b897

Browse files
baronfelbaronfel
authored
Merge pull request #933 from baronfel/integrate-againi
Integrate dotnet/fsharp and publish the Nuget dependency manager as another package
2 parents 66d5073 + 3f979bc commit 314b897

File tree

187 files changed

+13464
-9882
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+13464
-9882
lines changed

‎.devcontainer/Dockerfile‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#-------------------------------------------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
4+
#-------------------------------------------------------------------------------------------------------------
5+
6+
FROM mcr.microsoft.com/dotnet/core/sdk:3.1
7+
8+
# Avoid warnings by switching to noninteractive
9+
ENV DEBIAN_FRONTEND=noninteractive
10+
11+
# This Dockerfile adds a non-root user with sudo access. Use the "remoteUser"
12+
# property in devcontainer.json to use it. On Linux, the container user's GID/UIDs
13+
# will be updated to match your local UID/GID (when using the dockerFile property).
14+
# See https://aka.ms/vscode-remote/containers/non-root-user for details.
15+
ARG USERNAME=vscode
16+
ARG USER_UID=1000
17+
ARG USER_GID=$USER_UID
18+
19+
# Configure apt and install packages
20+
RUN apt-get update \
21+
&& apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \
22+
#
23+
# Verify git, process tools, lsb-release (common in install instructions for CLIs) installed
24+
&& apt-get -y install git openssh-client less iproute2 procps lsb-release \
25+
#
26+
# Create a non-root user to use if preferred - see https://aka.ms/vscode-remote/containers/non-root-user.
27+
&& groupadd --gid $USER_GID $USERNAME \
28+
&& useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \
29+
# [Optional] Add sudo support for the non-root user
30+
&& apt-get install -y sudo \
31+
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\
32+
&& chmod 0440 /etc/sudoers.d/$USERNAME \
33+
#
34+
# Clean up
35+
&& apt-get autoremove -y \
36+
&& apt-get clean -y \
37+
&& rm -rf /var/lib/apt/lists/*
38+
39+
# Switch back to dialog for any ad-hoc use of apt-get
40+
ENV DEBIAN_FRONTEND=dialog

‎.devcontainer/devcontainer.json‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
2+
// https://github.com/microsoft/vscode-dev-containers/tree/v0.108.0/containers/dotnetcore-3.1-fsharp
3+
{
4+
"name": "F# (.NET Core 3.1)",
5+
"dockerFile": "Dockerfile",
6+
7+
// Set *default* container specific settings.json values on container create.
8+
//
9+
// .NET Core is now the default for F# in .NET Core 3.0+
10+
// However, .NET Core scripting is not the default yet. Set that to true.
11+
"settings": {
12+
"terminal.integrated.shell.linux": "/bin/bash",
13+
"FSharp.useSdkScripts":true,
14+
"editor.trimAutoWhitespace": false,
15+
"files.trimTrailingWhitespace": false,
16+
"FSharp.suggestGitignore": false,
17+
"FSharp.workspacePath": "FSharp.sln"
18+
},
19+
20+
// Add the IDs of extensions you want installed when the container is created.
21+
"extensions": [
22+
"Ionide.Ionide-fsharp",
23+
"ms-dotnettools.csharp"
24+
],
25+
26+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
27+
// "forwardPorts": [],
28+
29+
// Use 'postCreateCommand' to run commands after the container is created.
30+
"postCreateCommand": "./build.sh",
31+
32+
// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
33+
// "remoteUser": "vscode"
34+
}

‎.vscode/settings.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"editor.trimAutoWhitespace": false,
3+
"files.trimTrailingWhitespace": false,
4+
"FSharp.suggestGitignore": false,
5+
"FSharp.workspacePath": "FSharp.sln"
6+
}

‎FSharpBuild.Directory.Build.targets‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
44
<Import Project="eng\targets\Imports.targets" />
55
<Import Project="eng\targets\NuGet.targets" />
6-
<Import Project="eng\targets\NGenBinaries.targets" />
76
<Import Project="FSharp.Profiles.props" />
87

98
<Target Name="NoneSubstituteTextFiles"
@@ -72,13 +71,13 @@
7271
DependsOnTargets="CopyVsixResources"
7372
Condition="'$(Configuration)' != 'Proto' and '$(Language)'=='F#' and '$(DisableCompilerRedirection)' != 'true' ">
7473

75-
<SubstituteText EmbeddedResources="@(EmbeddedResource)">
74+
<!-- <SubstituteText EmbeddedResources="@(EmbeddedResource)">
7675
<Output TaskParameter="CopiedFiles" ItemName="CopiedFiles" />
77-
</SubstituteText>
76+
</SubstituteText> -->
7877

7978
<ItemGroup>
8079
<EmbeddedResource Remove="@(EmbeddedResource)"/>
81-
<EmbeddedResource Include="@(CopiedFiles)"/>
80+
<!-- <EmbeddedResource Include="@(CopiedFiles)"/> -->
8281
</ItemGroup>
8382

8483
<MakeDir Directories="$(IntermediateOutputPath)" Condition="!Exists('$(IntermediateOutputPath)')" />

‎NuGet.config‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
<clear />
99
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
1010
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
11+
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
12+
<add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" />
1113
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
1214
<add key="fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
1315
<add key="roslyn-master-nightly" value="https://dotnet.myget.org/F/roslyn-master-nightly/api/v3/index.json" />
14-
<add key="myget-dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
15-
<add key="dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
1616
<add key="roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
1717
<add key="roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
1818
<add key="symreader-converter" value="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json" />
@@ -22,11 +22,6 @@
2222
<add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
2323
<add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
2424
<add key="roslyn_concord" value="https://myget.org/F/roslyn_concord/api/v3/index.json" />
25-
<add key="dotnet-windowsdesktop" value="https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json" />
26-
<add key="aspnet-aspnetcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />
27-
<add key="aspnet-aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
28-
<add key="aspnet-entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
29-
<add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
3025
<add key="gRPC repository" value="https://grpc.jfrog.io/grpc/api/nuget/v3/grpc-nuget-dev" />
3126
</packageSources>
3227
<disabledPackageSources>

‎appveyor.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ build_script:
99
test: off
1010
version: '{build}'
1111
artifacts:
12-
- path: artifacts\bin\fcs\Release\*.nupkg
12+
- path: artifacts\bin\fcs\Release\*.nupkg
13+
- path: artifacts\packages\Release\Shipping\*.nupkg

‎clean.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ DEAD_DIRS=(
66
"eng/common/templates"
77
"FSharp.sln"
88
"src/fsharp/fsc/fsc.fsproj"
9+
"src/fsharp/FSharp.Build/FSharp.Build.fsproj"
910
"src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec"
1011
"src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj"
12+
"src/fsharp/FSharp.DependencyManager/xlf/"
1113
"src/fsharp/fsi/fsi.fsproj"
1214
"src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj"
1315
"src/fsharp/Interactive.DependencyManager/xlf"
@@ -20,6 +22,7 @@ DEAD_DIRS=(
2022
"tests/fsharp/Compiler"
2123
"tests/fsharp/conformance"
2224
"tests/fsharp/core"
25+
"tests/fsharp/FSharpSuite.Tests.fsproj"
2326
"tests/fsharp/test-framework.fs"
2427
"tests/fsharp/tests.fs"
2528
"tests/fsharp/typecheck"

‎eng/Build.ps1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ try {
324324

325325
if ($bootstrap) {
326326
$script:BuildMessage = "Failure building bootstrap compiler"
327+
$toolsetBuildProj = InitializeToolset
327328
$bootstrapDir = Make-BootstrapBuild
328329
}
329330

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20124.2">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20208.8">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>0b8ce7c1c078eefb4cbc4d7e67ffc02f1f73382d</Sha>
8+
<Sha>0554dd21ef58e0ad23ad20388d05f11ab6cf3fa7</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@
1414
<PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
1515
<FSLanguageVersion>4.7</FSLanguageVersion>
1616
<FSCoreMajorVersion>$(FSLanguageVersion)</FSCoreMajorVersion>
17-
<FSCorePackageVersion>$(FSCoreMajorVersion).1</FSCorePackageVersion>
17+
<FSCorePackageVersion>$(FSCoreMajorVersion).2</FSCorePackageVersion>
1818
<FSCoreVersionPrefix>$(FSCoreMajorVersion).0</FSCoreVersionPrefix>
1919
<FSCoreVersion>$(FSCoreVersionPrefix).0</FSCoreVersion>
2020
<!-- The current published nuget package -->
21-
<FSharpCoreShippedPackageVersion>4.7.0</FSharpCoreShippedPackageVersion>
21+
<FSharpCoreShippedPackageVersion>4.7.1</FSharpCoreShippedPackageVersion>
2222
<!-- The pattern for specifying the preview package -->
2323
<FSharpCorePreviewPackageVersion>$(FSCorePackageVersion)-$(PreReleaseVersionLabel).*</FSharpCorePreviewPackageVersion>
2424
</PropertyGroup>
2525
<PropertyGroup>
26-
<FSPackageMajorVersion>10.7</FSPackageMajorVersion>
26+
<FSPackageMajorVersion>10.8</FSPackageMajorVersion>
2727
<FSPackageVersion>$(FSPackageMajorVersion).1</FSPackageVersion>
2828
<FSProductVersionPrefix>$(FSPackageVersion)</FSProductVersionPrefix>
2929
<FSProductVersion>$(FSPackageVersion).0</FSProductVersion>
3030
</PropertyGroup>
3131
<PropertyGroup>
3232
<VSMajorVersion>16</VSMajorVersion>
33-
<VSMinorVersion>4</VSMinorVersion>
33+
<VSMinorVersion>5</VSMinorVersion>
3434
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
3535
<VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
3636
<VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>
@@ -158,7 +158,7 @@
158158
<MicrosoftVisualStudioUtilitiesVersion>16.1.28917.181</MicrosoftVisualStudioUtilitiesVersion>
159159
<MicrosoftVisualStudioValidationVersion>15.3.58</MicrosoftVisualStudioValidationVersion>
160160
<MicrosoftVisualStudioWCFReferenceInteropVersion>9.0.30729</MicrosoftVisualStudioWCFReferenceInteropVersion>
161-
<MicrosoftVSSDKBuildToolsVersion>16.3.2099</MicrosoftVSSDKBuildToolsVersion>
161+
<MicrosoftVSSDKBuildToolsVersion>16.5.2044</MicrosoftVSSDKBuildToolsVersion>
162162
<VSSDKDebuggerVisualizersVersion>12.0.4</VSSDKDebuggerVisualizersVersion>
163163
<VSSDKVSLangProjVersion>7.0.4</VSSDKVSLangProjVersion>
164164
<VSSDKVSLangProj8Version>8.0.4</VSSDKVSLangProj8Version>

0 commit comments

Comments
 (0)