Skip to content

Commit 897afd3

Browse files
brettfobrettfo
authored
Merge pull request #7301 from KevinRansom/release/fsharp47
Release/fsharp47
2 parents d979174 + 54f13f0 commit 897afd3

File tree

216 files changed

+5172
-3321
lines changed

Some content is hidden

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

216 files changed

+5172
-3321
lines changed

‎.vsts-signed.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,14 @@ jobs:
105105
continueOnError: true
106106
condition: succeeded()
107107

108+
# Publish native PDBs for archiving
109+
- task: PublishBuildArtifacts@1
110+
displayName: Publish Artifact Symbols
111+
inputs:
112+
PathtoPublish: '$(Build.SourcesDirectory)/artifacts/SymStore/$(BuildConfiguration)'
113+
ArtifactName: NativeSymbols
114+
condition: succeeded()
115+
108116
# Execute cleanup tasks
109117
- task: ms-vseng.MicroBuildTasks.521a94ea-9e68-468a-8167-6dcf361ea776.MicroBuildCleanup@1
110118
displayName: Execute cleanup tasks

‎FSharpBuild.Directory.Build.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
<RepositoryUrl Condition="'$(RepositoryUrl)' == ''">https://github.com/Microsoft/visualfsharp</RepositoryUrl>
7676
<RepositoryType Condition="'$(RepositoryType)' == ''">git</RepositoryType>
7777
</PropertyGroup>
78+
7879
<PropertyGroup Condition="'$(FSharpSourceBuild)' == 'true' AND '$(RepositoryCommit)' == ''">
7980
<_DotGitDir>$(RepoRoot).git</_DotGitDir>
8081
<_HeadFileContent Condition="Exists('$(_DotGitDir)/HEAD')">$([System.IO.File]::ReadAllText('$(_DotGitDir)/HEAD').Trim())</_HeadFileContent>
@@ -87,7 +88,7 @@
8788
<PropertyGroup>
8889
<NoWarn Condition="'$(Language)' == 'F#'">$(NoWarn);FS2003</NoWarn><!-- warning when AssemblyInformationalVersion looks like '1.2.3-dev' -->
8990
<NoCompilerStandardLib>true</NoCompilerStandardLib><!-- necessary for resource generation using csc.exe -->
90-
<DebugType>portable</DebugType>
91+
<DebugType>embedded</DebugType>
9192
<MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
9293
<UseStandardResourceNames>false</UseStandardResourceNames>
9394
<GenerateDocumentationFile>true</GenerateDocumentationFile>

‎NuGet.config‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,20 @@
88
<clear />
99
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
1010
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
11+
<add key="fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
12+
<add key="roslyn-master-nightly" value="https://dotnet.myget.org/F/roslyn-master-nightly/api/v3/index.json" />
13+
<add key="myget-dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
14+
<add key="dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
15+
<add key="roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
16+
<add key="roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
17+
<add key="symreader-converter" value="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json" />
18+
<add key="interactive-window" value="https://dotnet.myget.org/F/interactive-window/api/v3/index.json" />
19+
<add key="vs-devcore" value="https://myget.org/F/vs-devcore/api/v3/index.json" />
20+
<add key="vs-editor" value="https://myget.org/F/vs-editor/api/v3/index.json" />
21+
<add key="vssdk" value="https://vside.myget.org/F/vssdk/api/v3/index.json" />
22+
<add key="vs-impl" value="https://vside.myget.org/F/vs-impl/api/v3/index.json" />
23+
<add key="roslyn_concord" value="https://myget.org/F/roslyn_concord/api/v3/index.json" />
24+
<add key="devcore" value="https://vside.myget.org/F/devcore/api/v3/index.json" />
1125
</packageSources>
1226
<disabledPackageSources>
1327
<clear />

‎azure-pipelines.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,12 @@ jobs:
113113
PathtoPublish: '$(Build.SourcesDirectory)\artifacts\VSSetup\$(_BuildConfig)\VisualFSharpFull.vsix'
114114
ArtifactName: 'Nightly'
115115
condition: succeeded()
116+
- task: PublishBuildArtifacts@1
117+
displayName: Publish Artifact Symbols
118+
inputs:
119+
PathtoPublish: '$(Build.SourcesDirectory)\artifacts\SymStore\$(_BuildConfig)'
120+
ArtifactName: 'NativeSymbols'
121+
condition: succeeded()
116122

117123
#---------------------------------------------------------------------------------------------------------------------#
118124
# PR builds #

‎eng/Build.ps1‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -225,13 +225,14 @@ function UpdatePath() {
225225
TestAndAddToPath "$ArtifactsDir\bin\fsiAnyCpu\$configuration\net472"
226226
}
227227

228-
function VerifyAssemblyVersions() {
229-
$fsiPath = Join-Path $ArtifactsDir "bin\fsi\Proto\net472\publish\fsi.exe"
228+
function VerifyAssemblyVersionsAndSymbols() {
229+
$assemblyVerCheckPath = Join-Path $ArtifactsDir "Bootstrap\AssemblyCheck\AssemblyCheck.dll"
230230

231231
# Only verify versions on CI or official build
232232
if ($ci -or $official) {
233-
$asmVerCheckPath = "$RepoRoot\scripts"
234-
Exec-Console $fsiPath """$asmVerCheckPath\AssemblyVersionCheck.fsx"" -- ""$ArtifactsDir"""
233+
$dotnetPath = InitializeDotNetCli
234+
$dotnetExe = Join-Path $dotnetPath "dotnet.exe"
235+
Exec-Console $dotnetExe """$assemblyVerCheckPath"" ""$ArtifactsDir"""
235236
}
236237
}
237238

@@ -308,7 +309,7 @@ try {
308309
}
309310

310311
if ($build) {
311-
VerifyAssemblyVersions
312+
VerifyAssemblyVersionsAndSymbols
312313
}
313314

314315
$desktopTargetFramework = "net472"

‎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.19359.6">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19378.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>0f5dd7680174620f31c9a00cdb2ac0b0e70e631f</Sha>
8+
<Sha>a8e982d3bac01d8f4f91a4c57191147570079448</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/build-utils.ps1‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,10 +236,11 @@ function Make-BootstrapBuild() {
236236
Remove-Item -re $dir -ErrorAction SilentlyContinue
237237
Create-Directory $dir
238238

239-
# prepare FsLex and Fsyacc
239+
# prepare FsLex and Fsyacc and AssemblyCheck
240240
Run-MSBuild "$RepoRoot\src\buildtools\buildtools.proj" "/restore /t:Publish" -logFileName "BuildTools" -configuration $bootstrapConfiguration
241241
Copy-Item "$ArtifactsDir\bin\fslex\$bootstrapConfiguration\netcoreapp2.1\publish" -Destination "$dir\fslex" -Force -Recurse
242242
Copy-Item "$ArtifactsDir\bin\fsyacc\$bootstrapConfiguration\netcoreapp2.1\publish" -Destination "$dir\fsyacc" -Force -Recurse
243+
Copy-Item "$ArtifactsDir\bin\AssemblyCheck\$bootstrapConfiguration\netcoreapp2.1\publish" -Destination "$dir\AssemblyCheck" -Force -Recurse
243244

244245
# prepare compiler
245246
$projectPath = "$RepoRoot\proto.proj"

‎eng/common/SigningValidation.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!--
44
This MSBuild file is intended to be used as the body of the default
55
publishing release pipeline. The release pipeline will use this file
6-
to invoke the the SignCheck tool to validate that packages about to
6+
to invoke the SignCheck tool to validate that packages about to
77
be published are correctly signed.
88
99
Parameters:

‎eng/common/build.sh‎

100644100755
File mode changed.

‎eng/common/cibuild.sh‎

100644100755
File mode changed.

0 commit comments

Comments
 (0)