Skip to content

Commit 40bb7ac

Browse files
brettfobaronfel
brettfo
authored and
baronfel
committed
Merge pull request #7925 from dotnet/merges/release/dev16.4-to-master
Merge release/dev16.4 to master
2 parents d966659 + ba677fd commit 40bb7ac

27 files changed

+65
-1784
lines changed

‎FSharp.Profiles.props‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,12 @@
55
<PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
66
<DefineConstants Condition="'$(MonoPackaging)' == 'true'">$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
77
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
8-
<DefineConstants>$(DefineConstants);BE_SECURITY_TRANSPARENT</DefineConstants>
98
</PropertyGroup>
109

1110
<PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard')) OR $(TargetFramework.StartsWith('netcoreapp'))">
1211
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
1312
<DefineConstants>$(DefineConstants);FX_NO_APP_DOMAINS</DefineConstants>
1413
<DefineConstants>$(DefineConstants);FX_NO_CORHOST_SIGNER</DefineConstants>
15-
<DefineConstants>$(DefineConstants);FX_NO_EVENTWAITHANDLE_IDISPOSABLE</DefineConstants>
16-
<DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
17-
<DefineConstants>$(DefineConstants);FX_NO_PARAMETERIZED_THREAD_START</DefineConstants>
1814
<DefineConstants>$(DefineConstants);FX_NO_PDB_READER</DefineConstants>
1915
<DefineConstants>$(DefineConstants);FX_NO_PDB_WRITER</DefineConstants>
2016
<DefineConstants>$(DefineConstants);FX_NO_SYMBOLSTORE</DefineConstants>

‎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.19602.4">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19476.6">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>9d34fd008e754e1ada35c8b6bc3694e7a90b4ed7</Sha>
8+
<Sha>b449f372df1a3374ebdc85f42ff137dcda08776b</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
<FSharpCorePreviewPackageVersion>$(FSCorePackageVersion)-$(PreReleaseVersionLabel).*</FSharpCorePreviewPackageVersion>
2424
</PropertyGroup>
2525
<PropertyGroup>
26-
<FSPackageMajorVersion>10.6</FSPackageMajorVersion>
26+
<FSPackageMajorVersion>10.7</FSPackageMajorVersion>
2727
<FSPackageVersion>$(FSPackageMajorVersion).0</FSPackageVersion>
2828
<FSProductVersionPrefix>$(FSPackageVersion)</FSProductVersionPrefix>
2929
<FSProductVersion>$(FSPackageVersion).0</FSProductVersion>
3030
</PropertyGroup>
3131
<PropertyGroup>
3232
<VSMajorVersion>16</VSMajorVersion>
33-
<VSMinorVersion>3</VSMinorVersion>
33+
<VSMinorVersion>4</VSMinorVersion>
3434
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
3535
<VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
3636
<VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>
@@ -155,7 +155,7 @@
155155
<MicrosoftVisualStudioUtilitiesVersion>16.1.28917.181</MicrosoftVisualStudioUtilitiesVersion>
156156
<MicrosoftVisualStudioValidationVersion>15.3.58</MicrosoftVisualStudioValidationVersion>
157157
<MicrosoftVisualStudioWCFReferenceInteropVersion>9.0.30729</MicrosoftVisualStudioWCFReferenceInteropVersion>
158-
<MicrosoftVSSDKBuildToolsVersion>16.0.2264</MicrosoftVSSDKBuildToolsVersion>
158+
<MicrosoftVSSDKBuildToolsVersion>16.3.2099</MicrosoftVSSDKBuildToolsVersion>
159159
<VSSDKDebuggerVisualizersVersion>12.0.4</VSSDKDebuggerVisualizersVersion>
160160
<VSSDKVSLangProjVersion>7.0.4</VSSDKVSLangProjVersion>
161161
<VSSDKVSLangProj8Version>8.0.4</VSSDKVSLangProj8Version>

‎eng/common/enable-cross-org-publishing.ps1‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,5 @@ param(
22
[string] $token
33
)
44

5-
. $PSScriptRoot\pipeline-logging-functions.ps1
6-
7-
Write-PipelineSetVariable -Name 'VSS_NUGET_ACCESSTOKEN' -Value $token
8-
Write-PipelineSetVariable -Name 'VSS_NUGET_URI_PREFIXES' -Value 'https://dnceng.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/dnceng/;https://devdiv.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/devdiv/'
5+
Write-Host "##vso[task.setvariable variable=VSS_NUGET_ACCESSTOKEN]$token"
6+
Write-Host "##vso[task.setvariable variable=VSS_NUGET_URI_PREFIXES]https://dnceng.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/dnceng/;https://devdiv.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/devdiv/"

‎eng/common/sdl/execute-all-sdl-tools.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Param(
55
[string] $Repository=$env:BUILD_REPOSITORY_NAME, # Required: the name of the repository (e.g. dotnet/arcade)
66
[string] $BranchName=$env:BUILD_SOURCEBRANCH, # Optional: name of branch or version of gdn settings; defaults to master
77
[string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY, # Required: the directory where source files are located
8-
[string] $ArtifactsDirectory = (Join-Path $env:BUILD_ARTIFACTSTAGINGDIRECTORY ('artifacts')), # Required: the directory where build artifacts are located
8+
[string] $ArtifactsDirectory = (Join-Path $env:BUILD_ARTIFACTSTAGINGDIRECTORY ("artifacts")), # Required: the directory where build artifacts are located
99
[string] $AzureDevOpsAccessToken, # Required: access token for dnceng; should be provided via KeyVault
1010
[string[]] $SourceToolsList, # Optional: list of SDL tools to run on source code
1111
[string[]] $ArtifactToolsList, # Optional: list of SDL tools to run on built artifacts
@@ -22,7 +22,7 @@ Param(
2222
[string] $TsaCodebaseAdmin, # Optional: only needed if TsaOnboard is true; the aliases which are admins of the TSA codebase (e.g. DOMAIN\alias); TSA is the automated framework used to upload test results as bugs.
2323
[string] $TsaBugAreaPath, # Optional: only needed if TsaOnboard is true; the area path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs.
2424
[string] $TsaIterationPath, # Optional: only needed if TsaOnboard is true; the iteration path where TSA will file bugs in AzDO; TSA is the automated framework used to upload test results as bugs.
25-
[string] $GuardianLoggerLevel='Standard', # Optional: the logger level for the Guardian CLI; options are Trace, Verbose, Standard, Warning, and Error
25+
[string] $GuardianLoggerLevel="Standard", # Optional: the logger level for the Guardian CLI; options are Trace, Verbose, Standard, Warning, and Error
2626
[string[]] $CrScanAdditionalRunConfigParams, # Optional: Additional Params to custom build a CredScan run config in the format @("xyz:abc","sdf:1")
2727
[string[]] $PoliCheckAdditionalRunConfigParams # Optional: Additional Params to custom build a Policheck run config in the format @("xyz:abc","sdf:1")
2828
)

‎eng/common/sdl/extract-artifact-packages.ps1‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,33 @@ param(
66
$ErrorActionPreference = 'Stop'
77
Set-StrictMode -Version 2.0
88

9+
# `tools.ps1` checks $ci to perform some actions. Since the post-build
10+
# scripts don't necessarily execute in the same agent that run the
11+
# build.ps1/sh script this variable isn't automatically set.
12+
$ci = $true
13+
. $PSScriptRoot\..\tools.ps1
14+
15+
$ExtractPackage = {
16+
param(
17+
[string] $PackagePath # Full path to a NuGet package
18+
)
19+
20+
if (!(Test-Path $PackagePath)) {
21+
Write-PipelineTaskError "Input file does not exist: $PackagePath"
22+
ExitWithExitCode 1
23+
}
24+
25+
$RelevantExtensions = @(".dll", ".exe", ".pdb")
26+
Write-Host -NoNewLine "Extracting" ([System.IO.Path]::GetFileName($PackagePath)) "... "
27+
28+
$PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath)
29+
$ExtractPath = Join-Path -Path $using:ExtractPath -ChildPath $PackageId
30+
31+
Add-Type -AssemblyName System.IO.Compression.FileSystem
32+
33+
[System.IO.Directory]::CreateDirectory($ExtractPath);
34+
>>>>>>> refs/rewritten/upstream/release/dev16.4
35+
936
# `tools.ps1` checks $ci to perform some actions. Since the post-build
1037
# scripts don't necessarily execute in the same agent that run the
1138
# build.ps1/sh script this variable isn't automatically set.

‎eng/common/templates/job/execute-sdl.yml‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,13 @@ jobs:
2323
steps:
2424
- checkout: self
2525
clean: true
26-
- ${{ if ne(parameters.artifactNames, '') }}:
27-
- ${{ each artifactName in parameters.artifactNames }}:
28-
- task: DownloadBuildArtifacts@0
29-
displayName: Download Build Artifacts
30-
inputs:
31-
buildType: current
32-
artifactName: ${{ artifactName }}
33-
downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
34-
- ${{ if eq(parameters.artifactNames, '') }}:
35-
- task: DownloadBuildArtifacts@0
36-
displayName: Download Build Artifacts
37-
inputs:
38-
buildType: current
39-
downloadType: specific files
40-
itemPattern: "**"
41-
downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
26+
- task: DownloadBuildArtifacts@0
27+
displayName: Download Build Artifacts
28+
inputs:
29+
buildType: current
30+
downloadType: specific files
31+
matchingPattern: "**"
32+
downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
4233
- powershell: eng/common/sdl/extract-artifact-packages.ps1
4334
-InputPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts
4435
-ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts

‎eng/common/templates/job/job.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ parameters:
1717
workspace: ''
1818

1919
# Job base template specific parameters
20-
# See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md
20+
# See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md
2121
artifacts: ''
2222
enableMicrobuild: false
2323
enablePublishBuildArtifacts: false

‎eng/common/templates/post-build/channels/generic-internal-channel.yml‎

Lines changed: 0 additions & 177 deletions
This file was deleted.

0 commit comments

Comments
 (0)