Skip to content

Commit 6f4968d

Browse files
KevinRansomKevinRansom
authored
Merge pull request #9247 from dotnet/merges/master-to-release/dev16.7
Merge master to release/dev16.7
2 parents 6c753b9 + d4b5b3a commit 6f4968d

6 files changed

Lines changed: 69 additions & 94 deletions

File tree

‎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.20230.5">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20269.3">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>5fd50687c9a9f39bd2ee8221165ea9c1b3f565d9</Sha>
8+
<Sha>ccfddb60fbd3de13463298334f00610edb5f63c6</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/common/templates/post-build/common-variables.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,6 @@ variables:
2929
- name: NetCore_3_Tools_Channel_Id
3030
value: 344
3131

32-
# .NET Core 3.0 Internal Servicing
33-
- name: InternalServicing_30_Channel_Id
34-
value: 184
35-
36-
# .NET Core 3.0 Release
37-
- name: PublicRelease_30_Channel_Id
38-
value: 19
39-
4032
# .NET Core 3.1 Release
4133
- name: PublicRelease_31_Channel_Id
4234
value: 129

‎eng/common/templates/post-build/post-build.yml‎

Lines changed: 25 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -103,18 +103,6 @@ stages:
103103
continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }}
104104
artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }}
105105

106-
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
107-
parameters:
108-
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
109-
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
110-
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
111-
stageName: 'NetCore_Dev5_Publish'
112-
channelName: '.NET Core 5 Dev'
113-
channelId: 131
114-
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
115-
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
116-
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
117-
118106
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
119107
parameters:
120108
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
@@ -175,18 +163,6 @@ stages:
175163
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
176164
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
177165

178-
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
179-
parameters:
180-
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
181-
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
182-
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
183-
stageName: 'NetCore_Release30_Publish'
184-
channelName: '.NET Core 3.0 Release'
185-
channelId: 19
186-
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json'
187-
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json'
188-
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json'
189-
190166
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
191167
parameters:
192168
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
@@ -211,18 +187,6 @@ stages:
211187
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json'
212188
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor-symbols/nuget/v3/index.json'
213189

214-
- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
215-
parameters:
216-
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
217-
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
218-
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
219-
stageName: 'NetCore_30_Internal_Servicing_Publishing'
220-
channelName: '.NET Core 3.0 Internal Servicing'
221-
channelId: 184
222-
transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json'
223-
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json'
224-
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json'
225-
226190
- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
227191
parameters:
228192
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
@@ -271,30 +235,6 @@ stages:
271235
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
272236
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
273237

274-
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
275-
parameters:
276-
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
277-
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
278-
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
279-
stageName: 'NETCore_SDK_301xx_Publishing'
280-
channelName: '.NET Core SDK 3.0.1xx'
281-
channelId: 556
282-
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json'
283-
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json'
284-
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json'
285-
286-
- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
287-
parameters:
288-
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
289-
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
290-
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
291-
stageName: 'NETCore_SDK_301xx_Internal_Publishing'
292-
channelName: '.NET Core SDK 3.0.1xx Internal'
293-
channelId: 555
294-
transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json'
295-
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json'
296-
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json'
297-
298238
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
299239
parameters:
300240
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
@@ -389,4 +329,28 @@ stages:
389329
channelId: 922
390330
transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json'
391331
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json'
392-
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json'
332+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json'
333+
334+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
335+
parameters:
336+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
337+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
338+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
339+
stageName: 'VS16_6_Publishing'
340+
channelName: 'VS 16.6'
341+
channelId: 1010
342+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
343+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
344+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
345+
346+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
347+
parameters:
348+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
349+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
350+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
351+
stageName: 'VS16_7_Publishing'
352+
channelName: 'VS 16.7'
353+
channelId: 1011
354+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
355+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
356+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'

‎eng/common/tools.ps1‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,9 @@ function InitializeDotNetCli([bool]$install) {
119119

120120
# Find the first path on %PATH% that contains the dotnet.exe
121121
if ($useInstalledDotNetCli -and (-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -eq $null)) {
122-
$dotnetCmd = Get-Command "dotnet.exe" -ErrorAction SilentlyContinue
122+
$dotnetExecutable = GetExecutableFileName 'dotnet'
123+
$dotnetCmd = Get-Command $dotnetExecutable -ErrorAction SilentlyContinue
124+
123125
if ($dotnetCmd -ne $null) {
124126
$env:DOTNET_INSTALL_DIR = Split-Path $dotnetCmd.Path -Parent
125127
}
@@ -243,6 +245,10 @@ function InstallDotNet([string] $dotnetRoot,
243245
# Throws on failure.
244246
#
245247
function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = $null) {
248+
if (-not (IsWindowsPlatform)) {
249+
throw "Cannot initialize Visual Studio on non-Windows"
250+
}
251+
246252
if (Test-Path variable:global:_MSBuildExe) {
247253
return $global:_MSBuildExe
248254
}
@@ -344,7 +350,11 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) {
344350
# or $null if no instance meeting the requirements is found on the machine.
345351
#
346352
function LocateVisualStudio([object]$vsRequirements = $null){
347-
if (Get-Member -InputObject $GlobalJson.tools -Name "vswhere") {
353+
if (-not (IsWindowsPlatform)) {
354+
throw "Cannot run vswhere on non-Windows platforms."
355+
}
356+
357+
if (Get-Member -InputObject $GlobalJson.tools -Name 'vswhere') {
348358
$vswhereVersion = $GlobalJson.tools.vswhere
349359
} else {
350360
$vswhereVersion = "2.5.2"
@@ -404,7 +414,8 @@ function InitializeBuildTool() {
404414
Write-PipelineTelemetryError -Category "InitializeToolset" -Message "/global.json must specify 'tools.dotnet'."
405415
ExitWithExitCode 1
406416
}
407-
$buildTool = @{ Path = Join-Path $dotnetRoot "dotnet.exe"; Command = "msbuild"; Tool = "dotnet"; Framework = "netcoreapp2.1" }
417+
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
418+
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'netcoreapp2.1' }
408419
} elseif ($msbuildEngine -eq "vs") {
409420
try {
410421
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore
@@ -610,6 +621,19 @@ function GetMSBuildBinaryLogCommandLineArgument($arguments) {
610621
return $null
611622
}
612623

624+
function GetExecutableFileName($baseName) {
625+
if (IsWindowsPlatform) {
626+
return "$baseName.exe"
627+
}
628+
else {
629+
return $baseName
630+
}
631+
}
632+
633+
function IsWindowsPlatform() {
634+
return [environment]::OSVersion.Platform -eq [PlatformID]::Win32NT
635+
}
636+
613637
. $PSScriptRoot\pipeline-logging-functions.ps1
614638

615639
$RepoRoot = Resolve-Path (Join-Path $PSScriptRoot "..\..")

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111
},
1212
"msbuild-sdks": {
13-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20230.5",
13+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20269.3",
1414
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
1515
}
1616
}

‎src/absil/il.fs‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1954,22 +1954,17 @@ type ILTypeDefKind =
19541954
| Enum
19551955
| Delegate
19561956

1957-
let typeKindOfFlags nm _mdefs _fdefs (super: ILType option) flags =
1957+
let typeKindOfFlags nm (super: ILType option) flags =
19581958
if (flags &&& 0x00000020) <> 0x0 then ILTypeDefKind.Interface
19591959
else
1960-
let isEnum, isDelegate, isMulticastDelegate, isValueType =
1961-
match super with
1962-
| None -> false, false, false, false
1963-
| Some ty ->
1964-
ty.TypeSpec.Name = "System.Enum",
1965-
ty.TypeSpec.Name = "System.Delegate",
1966-
ty.TypeSpec.Name = "System.MulticastDelegate",
1967-
ty.TypeSpec.Name = "System.ValueType" && nm <> "System.Enum"
1968-
let selfIsMulticastDelegate = nm = "System.MulticastDelegate"
1969-
if isEnum then ILTypeDefKind.Enum
1970-
elif (isDelegate && not selfIsMulticastDelegate) || isMulticastDelegate then ILTypeDefKind.Delegate
1971-
elif isValueType then ILTypeDefKind.ValueType
1972-
else ILTypeDefKind.Class
1960+
match super with
1961+
| None -> ILTypeDefKind.Class
1962+
| Some ty ->
1963+
let name = ty.TypeSpec.Name
1964+
if name = "System.Enum" then ILTypeDefKind.Enum
1965+
elif (name = "System.Delegate" && nm <> "System.MulticastDelegate") || name = "System.MulticastDelegate" then ILTypeDefKind.Delegate
1966+
elif name = "System.ValueType" && nm <> "System.Enum" then ILTypeDefKind.ValueType
1967+
else ILTypeDefKind.Class
19731968

19741969
let convertTypeAccessFlags access =
19751970
match access with
@@ -2071,11 +2066,11 @@ type ILTypeDef(name: string, attributes: TypeAttributes, layout: ILTypeDefLayout
20712066

20722067
member x.SecurityDecls = x.SecurityDeclsStored.GetSecurityDecls x.MetadataIndex
20732068

2074-
member x.IsClass = (typeKindOfFlags x.Name x.Methods x.Fields x.Extends (int x.Attributes)) = ILTypeDefKind.Class
2075-
member x.IsStruct = (typeKindOfFlags x.Name x.Methods x.Fields x.Extends (int x.Attributes)) = ILTypeDefKind.ValueType
2076-
member x.IsInterface = (typeKindOfFlags x.Name x.Methods x.Fields x.Extends (int x.Attributes)) = ILTypeDefKind.Interface
2077-
member x.IsEnum = (typeKindOfFlags x.Name x.Methods x.Fields x.Extends (int x.Attributes)) = ILTypeDefKind.Enum
2078-
member x.IsDelegate = (typeKindOfFlags x.Name x.Methods x.Fields x.Extends (int x.Attributes)) = ILTypeDefKind.Delegate
2069+
member x.IsClass = (typeKindOfFlags x.Name x.Extends (int x.Attributes)) = ILTypeDefKind.Class
2070+
member x.IsStruct = (typeKindOfFlags x.Name x.Extends (int x.Attributes)) = ILTypeDefKind.ValueType
2071+
member x.IsInterface = (typeKindOfFlags x.Name x.Extends (int x.Attributes)) = ILTypeDefKind.Interface
2072+
member x.IsEnum = (typeKindOfFlags x.Name x.Extends (int x.Attributes)) = ILTypeDefKind.Enum
2073+
member x.IsDelegate = (typeKindOfFlags x.Name x.Extends (int x.Attributes)) = ILTypeDefKind.Delegate
20792074
member x.Access = typeAccessOfFlags (int x.Attributes)
20802075
member x.IsAbstract = x.Attributes &&& TypeAttributes.Abstract <> enum 0
20812076
member x.IsSealed = x.Attributes &&& TypeAttributes.Sealed <> enum 0

0 commit comments

Comments
 (0)