Skip to content

Commit 3ae2127

Browse files
cartermpcartermp
committed
# This is a combination of 9 commits.
# This is the 1st commit message: ref -> mutable in more places in the compiler # The commit message dotnet#2 will be skipped: # Update dependencies from https://github.com/dotnet/arcade build 20191229.1 # # - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19629.1 # The commit message dotnet#3 will be skipped: # Update dependencies from https://github.com/dotnet/arcade build 20191230.1 # # - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19630.1 # The commit message dotnet#4 will be skipped: # Update dependencies from https://github.com/dotnet/arcade build 20191231.1 # # - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19631.1 # The commit message dotnet#5 will be skipped: # Update dependencies from https://github.com/dotnet/arcade build 20200101.1 # # - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20051.1 # The commit message dotnet#6 will be skipped: # Update dependencies from https://github.com/dotnet/arcade build 20191216.5 (dotnet#8079) # # - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19616.5 # The commit message dotnet#7 will be skipped: # dispose fsi at the end of a scripting session (dotnet#8084) # # The commit message dotnet#8 will be skipped: # Added static link tests and extended CompilerAssert (dotnet#8101) # # * Changed CompilerAssert to static class. Added Compile/Execute methods that take a Compilation description. Added static link tests # # * Hiding compilation description internals # # * Added another test to check for sanity # # * Making a few optional parameters # # * Hiding internals of CompilationReference # The commit message dotnet#9 will be skipped: # Parameterize product version (dotnet#8031) # # * Parameterize Product details # # * fcs # # * Repack pkgdef
1 parent af841de commit 3ae2127

File tree

132 files changed

+2732
-2237
lines changed

Some content is hidden

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

132 files changed

+2732
-2237
lines changed

‎FSharpBuild.Directory.Build.targets

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Project>
2+
23
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
34
<Import Project="eng\targets\Imports.targets" />
45
<Import Project="eng\targets\NuGet.targets" />
@@ -8,7 +9,7 @@
89
<Target Name="NoneSubstituteTextFiles"
910
Inputs="@(NoneSubstituteText)"
1011
Outputs="@(NoneSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')"
11-
BeforeTargets="AssignTargetPaths;BeforeBuild">
12+
BeforeTargets="AssignTargetPaths;BeforeBuild;GenerateFSharpTextResources">
1213

1314
<PropertyGroup>
1415
<__TargetFilePath>@(NoneSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')</__TargetFilePath>
@@ -20,16 +21,19 @@
2021

2122
<_CopyToOutputDirectory Condition="'%(NoneSubstituteText.CopyToOutputDirectory)' != ''">%(NoneSubstituteText.CopyToOutputDirectory)</_CopyToOutputDirectory>
2223
<_CopyToOutputDirectory Condition="'%(NoneSubstituteText.CopyToOutputDirectory)' == ''">Never</_CopyToOutputDirectory>
24+
25+
<_IncludeInVsix>false</_IncludeInVsix>
26+
<_IncludeInVsix Condition="'%(NoneSubstituteText.IncludeInVsix)' == 'true'">true</_IncludeInVsix>
2327
</PropertyGroup>
2428

2529
<MakeDir Directories="$(IntermediateOutputPath)"
2630
Condition="!Exists('$(IntermediateOutputPath)')" />
2731
<WriteLinesToFile File="$(__TargetFilePath)" Lines="$(_ReplacementText)" Overwrite="true" WriteOnlyWhenDifferent="true" />
2832

29-
<!-- Make sure it will get cleaned -->
30-
<ItemGroup >
33+
<ItemGroup>
3134
<None Include="$(__TargetFilePath)" CopyToOutputDirectory="$(_CopyToOutputDirectory)" />
3235
<FileWrites Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' != 'App.config'" />
36+
<Content Include="$(__TargetFilePath)" CopyToOutputDirectory="Always" IncludeInVsix="true" />
3337
</ItemGroup>
3438
</Target>
3539

@@ -61,4 +65,27 @@
6165
</ItemGroup>
6266
</Target>
6367

68+
<Target Name="BeforeResGen"
69+
Inputs="@(EmbeddedResource->'$(IntermediateOutputPath)%(Filename)%(Extension)')"
70+
Outputs="@(EmbeddedResource->'$(IntermediateOutputPath)resources\%(Filename)%(Extension)')"
71+
DependsOnTargets="CopyVsixResources"
72+
Condition="'$(Configuration)' != 'Proto' and '$(Language)'=='F#' and '$(DisableCompilerRedirection)' != 'true' ">
73+
74+
<SubstituteText EmbeddedResources="@(EmbeddedResource)">
75+
<Output TaskParameter="CopiedFiles" ItemName="CopiedFiles" />
76+
</SubstituteText>
77+
78+
<ItemGroup>
79+
<EmbeddedResource Remove="@(EmbeddedResource)"/>
80+
<EmbeddedResource Include="@(CopiedFiles)"/>
81+
</ItemGroup>
82+
83+
<MakeDir Directories="$(IntermediateOutputPath)" Condition="!Exists('$(IntermediateOutputPath)')" />
84+
<MakeDir Directories="$(IntermediateOutputPath)resources\" Condition="!Exists('$(IntermediateOutputPath)resources\')" />
85+
</Target>
86+
87+
<Target Name="CopyVsixResources">
88+
<Copy SourceFiles="@(CopyVsixResources)" DestinationFolder="$(IntermediateOutputPath)\resources\Resources" />
89+
</Target>
90+
6491
</Project>

‎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="5.0.0-beta.19627.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19616.5">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>d2d025c1de37b1258f147851cb3e7373ad5ff09d</Sha>
8+
<Sha>d4a1ce6278134f5dc25843e228d0498203031e61</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/common/CheckSymbols.ps1

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ param(
55
)
66

77
Add-Type -AssemblyName System.IO.Compression.FileSystem
8-
. $PSScriptRoot\pipeline-logging-functions.ps1
98

109
function FirstMatchingSymbolDescriptionOrDefault {
1110
param(
1211
[string] $FullPath, # Full path to the module that has to be checked
13-
[string] $TargetServerParameter, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols
12+
[string] $TargetServerParam, # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols
1413
[string] $SymbolsPath
1514
)
1615

@@ -22,36 +21,36 @@ function FirstMatchingSymbolDescriptionOrDefault {
2221
# checking and which type of file was uploaded.
2322

2423
# The file itself is returned
25-
$SymbolPath = $SymbolsPath + '\' + $FileName
24+
$SymbolPath = $SymbolsPath + "\" + $FileName
2625

2726
# PDB file for the module
28-
$PdbPath = $SymbolPath.Replace($Extension, '.pdb')
27+
$PdbPath = $SymbolPath.Replace($Extension, ".pdb")
2928

3029
# PDB file for R2R module (created by crossgen)
31-
$NGenPdb = $SymbolPath.Replace($Extension, '.ni.pdb')
30+
$NGenPdb = $SymbolPath.Replace($Extension, ".ni.pdb")
3231

3332
# DBG file for a .so library
34-
$SODbg = $SymbolPath.Replace($Extension, '.so.dbg')
33+
$SODbg = $SymbolPath.Replace($Extension, ".so.dbg")
3534

3635
# DWARF file for a .dylib
37-
$DylibDwarf = $SymbolPath.Replace($Extension, '.dylib.dwarf')
36+
$DylibDwarf = $SymbolPath.Replace($Extension, ".dylib.dwarf")
3837

39-
.\dotnet-symbol.exe --symbols --modules --windows-pdbs $TargetServerParameter $FullPath -o $SymbolsPath | Out-Null
38+
.\dotnet-symbol.exe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null
4039

4140
if (Test-Path $PdbPath) {
42-
return 'PDB'
41+
return "PDB"
4342
}
4443
elseif (Test-Path $NGenPdb) {
45-
return 'NGen PDB'
44+
return "NGen PDB"
4645
}
4746
elseif (Test-Path $SODbg) {
48-
return 'DBG for SO'
47+
return "DBG for SO"
4948
}
5049
elseif (Test-Path $DylibDwarf) {
51-
return 'Dwarf for Dylib'
50+
return "Dwarf for Dylib"
5251
}
5352
elseif (Test-Path $SymbolPath) {
54-
return 'Module'
53+
return "Module"
5554
}
5655
else {
5756
return $null
@@ -69,15 +68,15 @@ function CountMissingSymbols {
6968
}
7069

7170
# Extensions for which we'll look for symbols
72-
$RelevantExtensions = @('.dll', '.exe', '.so', '.dylib')
71+
$RelevantExtensions = @(".dll", ".exe", ".so", ".dylib")
7372

7473
# How many files are missing symbol information
7574
$MissingSymbols = 0
7675

7776
$PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath)
7877
$PackageGuid = New-Guid
7978
$ExtractPath = Join-Path -Path $ExtractPath -ChildPath $PackageGuid
80-
$SymbolsPath = Join-Path -Path $ExtractPath -ChildPath 'Symbols'
79+
$SymbolsPath = Join-Path -Path $ExtractPath -ChildPath "Symbols"
8180

8281
[System.IO.Compression.ZipFile]::ExtractToDirectory($PackagePath, $ExtractPath)
8382

@@ -87,31 +86,31 @@ function CountMissingSymbols {
8786
Get-ChildItem -Recurse $ExtractPath |
8887
Where-Object {$RelevantExtensions -contains $_.Extension} |
8988
ForEach-Object {
90-
if ($_.FullName -Match '\\ref\\') {
89+
if ($_.FullName -Match "\\ref\\") {
9190
Write-Host "`t Ignoring reference assembly file" $_.FullName
9291
return
9392
}
9493

95-
$SymbolsOnMSDL = FirstMatchingSymbolDescriptionOrDefault -FullPath $_.FullName -TargetServerParameter '--microsoft-symbol-server' -SymbolsPath $SymbolsPath
96-
$SymbolsOnSymWeb = FirstMatchingSymbolDescriptionOrDefault -FullPath $_.FullName -TargetServerParameter '--internal-server' -SymbolsPath $SymbolsPath
94+
$SymbolsOnMSDL = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--microsoft-symbol-server" $SymbolsPath
95+
$SymbolsOnSymWeb = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--internal-server" $SymbolsPath
9796

9897
Write-Host -NoNewLine "`t Checking file" $_.FullName "... "
9998

10099
if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) {
101-
Write-Host "Symbols found on MSDL (${$SymbolsOnMSDL}) and SymWeb (${$SymbolsOnSymWeb})"
100+
Write-Host "Symbols found on MSDL (" $SymbolsOnMSDL ") and SymWeb (" $SymbolsOnSymWeb ")"
102101
}
103102
else {
104103
$MissingSymbols++
105104

106105
if ($SymbolsOnMSDL -eq $null -and $SymbolsOnSymWeb -eq $null) {
107-
Write-Host 'No symbols found on MSDL or SymWeb!'
106+
Write-Host "No symbols found on MSDL or SymWeb!"
108107
}
109108
else {
110109
if ($SymbolsOnMSDL -eq $null) {
111-
Write-Host 'No symbols found on MSDL!'
110+
Write-Host "No symbols found on MSDL!"
112111
}
113112
else {
114-
Write-Host 'No symbols found on SymWeb!'
113+
Write-Host "No symbols found on SymWeb!"
115114
}
116115
}
117116
}
@@ -130,26 +129,26 @@ function CheckSymbolsAvailable {
130129
Get-ChildItem "$InputPath\*.nupkg" |
131130
ForEach-Object {
132131
$FileName = $_.Name
133-
132+
134133
# These packages from Arcade-Services include some native libraries that
135134
# our current symbol uploader can't handle. Below is a workaround until
136135
# we get issue: https://github.com/dotnet/arcade/issues/2457 sorted.
137-
if ($FileName -Match 'Microsoft\.DotNet\.Darc\.') {
136+
if ($FileName -Match "Microsoft\.DotNet\.Darc\.") {
138137
Write-Host "Ignoring Arcade-services file: $FileName"
139138
Write-Host
140139
return
141140
}
142-
elseif ($FileName -Match 'Microsoft\.DotNet\.Maestro\.Tasks\.') {
141+
elseif ($FileName -Match "Microsoft\.DotNet\.Maestro\.Tasks\.") {
143142
Write-Host "Ignoring Arcade-services file: $FileName"
144143
Write-Host
145144
return
146145
}
147-
146+
148147
Write-Host "Validating $FileName "
149148
$Status = CountMissingSymbols "$InputPath\$FileName"
150149

151150
if ($Status -ne 0) {
152-
Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $Status modules in the package $FileName"
151+
Write-Error "Missing symbols for $Status modules in the package $FileName"
153152
}
154153

155154
Write-Host

‎eng/common/PublishToSymbolServers.proj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
<PropertyGroup>
3838
<DotNetSymbolExpirationInDays Condition="'$(DotNetSymbolExpirationInDays)' == ''">3650</DotNetSymbolExpirationInDays>
3939
<PublishToSymbolServer>true</PublishToSymbolServer>
40-
<PublishToSymWeb Condition="'$(PublishToSymWeb)' == ''">true</PublishToSymWeb>
41-
<PublishToMSDL Condition="'$(PublishToMSDL)' == ''">true</PublishToMSDL>
4240
<PublishToSymbolServer Condition="'@(FilesToPublishToSymbolServer)' == '' and '@(PackagesToPublishToSymbolServer)' == ''">false</PublishToSymbolServer>
4341
</PropertyGroup>
4442

@@ -58,7 +56,7 @@
5856
DryRun="false"
5957
ConvertPortablePdbsToWindowsPdbs="false"
6058
PdbConversionTreatAsWarning=""
61-
Condition="$(PublishToSymbolServer) and $(PublishToMSDL)"/>
59+
Condition="$(PublishToSymbolServer)"/>
6260

6361
<!--
6462
Symbol Uploader: SymWeb
@@ -75,7 +73,7 @@
7573
DryRun="false"
7674
ConvertPortablePdbsToWindowsPdbs="false"
7775
PdbConversionTreatAsWarning=""
78-
Condition="$(PublishToSymbolServer) and $(PublishToSymWeb)"/>
76+
Condition="$(PublishToSymbolServer)"/>
7977
</Target>
8078

8179
<ItemGroup>

‎eng/common/SetupNugetSources.ps1

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ function AddCredential($creds, $source, $username, $password) {
8383
$passwordElement.SetAttribute("value", $Password)
8484
}
8585

86-
function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) {
86+
function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) {
8787
$maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")
8888

8989
Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."
@@ -123,19 +123,21 @@ if ($creds -eq $null) {
123123
$doc.DocumentElement.AppendChild($creds) | Out-Null
124124
}
125125

126+
$userName = "dn-bot"
127+
126128
# Insert credential nodes for Maestro's private feeds
127-
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password
129+
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password
128130

129131
$dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']")
130132
if ($dotnet3Source -ne $null) {
131-
AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password
132-
AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password
133+
AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
134+
AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
133135
}
134136

135137
$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
136138
if ($dotnet31Source -ne $null) {
137-
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password
138-
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password
139+
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
140+
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
139141
}
140142

141-
$doc.Save($filename)
143+
$doc.Save($filename)

‎eng/common/SetupNugetSources.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,4 +146,4 @@ for FeedName in ${PackageSources[@]} ; do
146146

147147
sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile
148148
fi
149-
done
149+
done

0 commit comments

Comments
 (0)