Skip to content

Commit a4064f1

Browse files
authored
Merge branch 'vs17.8' into merge/vs17.6-to-vs17.8
2 parents 5eb99e6 + d00a8a9 commit a4064f1

File tree

663 files changed

+27934
-11770
lines changed

Some content is hidden

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

663 files changed

+27934
-11770
lines changed

.editorconfig

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ trim_trailing_whitespace = true
1515
[project.json]
1616
indent_size = 2
1717

18+
[*.txt]
19+
insert_final_newline = false
20+
1821
# C# files
1922
[*.cs]
2023
# New line preferences
@@ -210,7 +213,7 @@ dotnet_analyzer_diagnostic.category-Style.severity = warning
210213
dotnet_diagnostic.IDE0004.severity = suggestion
211214

212215
# IDE0005: Remove unnecessary usings/imports
213-
dotnet_diagnostic.IDE0005.severity = warning
216+
dotnet_diagnostic.IDE0005.severity = none
214217

215218
# Use explicit type instead of 'var'
216219
dotnet_diagnostic.IDE0008.severity = suggestion
@@ -397,4 +400,11 @@ dotnet_diagnostic.IDE0251.severity = suggestion
397400
dotnet_diagnostic.IDE0270.severity = suggestion
398401

399402
# naming rule violation
400-
dotnet_diagnostic.IDE1006.severity = suggestion
403+
dotnet_diagnostic.IDE1006.severity = suggestion
404+
405+
# Use primary constructor
406+
dotnet_diagnostic.IDE0290.severity = suggestion
407+
408+
# Collection initialization can be simplified
409+
dotnet_diagnostic.IDE0300.severity = suggestion
410+
dotnet_diagnostic.IDE0301.severity = suggestion

.github/ISSUE_TEMPLATE/06_feature_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: 💡 Feature Request
22
description: Suggest an idea for this project.
33
title: "[Feature Request]: "
4-
labels: ["Feature Request"]
4+
labels: ["Feature Request", "needs-triage"]
55
body:
66
- type: textarea
77
attributes:
@@ -24,4 +24,4 @@ body:
2424
- type: textarea
2525
attributes:
2626
label: Alternative Designs
27-
description: If you have an idea how to achieve this new feature, let us know that here. Please include any pointers to code, relevant changes, or related issues you know of.
27+
description: If you have an idea how to achieve this new feature, let us know that here. Please include any pointers to code, relevant changes, or related issues you know of.

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ artifacts/
2121
# Visual Studio 2015 cache/options directory
2222
.vs/
2323

24+
# Verify result files
25+
*.received.*
26+
2427
*_i.c
2528
*_p.c
2629
*_i.h
@@ -218,3 +221,6 @@ stage1/
218221

219222
# .DS_Store for macOS
220223
**/.DS_Store
224+
225+
# We keep launchSettings.json local
226+
**/launchSettings.json

.vsts-dotnet-ci.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,12 @@ jobs:
100100
- job: FullReleaseOnWindows
101101
displayName: "Windows Full Release (no bootstrap)"
102102
pool:
103-
vmImage: 'windows-2022'
103+
${{ if eq(variables['System.TeamProject'], 'public') }}:
104+
name: NetCore-Public
105+
demands: ImageOverride -equals windows.vs2022preview.amd64.open
106+
${{ if ne(variables['System.TeamProject'], 'public') }}:
107+
name: VSEngSS-MicroBuild2022-1ES
108+
demands: agent.os -equals Windows_NT
104109
steps:
105110
- task: BatchScript@1
106111
displayName: cibuild.cmd
@@ -229,8 +234,4 @@ jobs:
229234
continueOnError: true
230235
condition: always()
231236

232-
- template: /eng/common/templates/job/source-build.yml
233-
parameters:
234-
platform:
235-
name: 'Managed'
236-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7'
237+
- template: /eng/common/templates/jobs/source-build.yml

.vsts-dotnet.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,9 @@ variables:
2323
- name: SourceBranch
2424
value: $(IbcSourceBranchName)
2525
# If we're not on a vs* branch, use main as our optprof collection branch
26-
# NOTE: the code is temporarily fixed. For the branches that should use opt-prof from the main branch we should use the latest working Opt-Prof collected from main 20230217.4.
2726
- ${{ if not(startsWith(variables['Build.SourceBranch'], 'refs/heads/vs')) }}:
28-
- name: OptProfDrop
29-
value: 'OptimizationData/DotNet-msbuild-Trusted/main/20230217.4/7352286/1'
3027
- name: SourceBranch
31-
value: ''
28+
value: main
3229
# if OptProfDropName is set as a parameter, set OptProfDrop to the parameter and unset SourceBranch
3330
- ${{ if ne(parameters.OptProfDropName, 'default') }}:
3431
- name: OptProfDrop

Directory.Build.props

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
src/Framework/README.md
2626
src/Utilities/README.md
2727
-->
28-
<LatestDotNetCoreForMSBuild>net7.0</LatestDotNetCoreForMSBuild>
28+
<LatestDotNetCoreForMSBuild>$(NetCurrent)</LatestDotNetCoreForMSBuild>
2929
</PropertyGroup>
3030

3131
<PropertyGroup>
@@ -77,10 +77,6 @@
7777
<MachineIndependentBuild>true</MachineIndependentBuild>
7878
</PropertyGroup>
7979

80-
<PropertyGroup>
81-
<AssemblyInformationCachePaths Condition="Exists('$(NetCoreRoot)sdk\$(NetCoreSdkVersion)\SdkPrecomputedAssemblyReferences.cache')">$(AssemblyInformationCachePaths);$(NetCoreRoot)sdk\$(NetCoreSdkVersion)\SDKPrecomputedAssemblyReferences.cache</AssemblyInformationCachePaths>
82-
</PropertyGroup>
83-
8480
<PropertyGroup>
8581
<DefaultItemExcludes>$(DefaultItemExcludes);*.log</DefaultItemExcludes>
8682
<DefaultItemExcludes>$(DefaultItemExcludes);*.binlog</DefaultItemExcludes>

MSBuild.Dev.slnf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"src\\Tasks\\Microsoft.Build.Tasks.csproj",
1414
"src\\Utilities.UnitTests\\Microsoft.Build.Utilities.UnitTests.csproj",
1515
"src\\Utilities\\Microsoft.Build.Utilities.csproj",
16-
"src\\Xunit.NetCore.Extensions\\Xunit.NetCore.Extensions.csproj"
16+
"src\\Xunit.NetCore.Extensions\\Xunit.NetCore.Extensions.csproj",
17+
"src\\StringTools\\StringTools.csproj"
1718
]
1819
}
1920
}

NuGet.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
77
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
88
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
9+
<add key="dotnet8" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet8/nuget/v3/index.json" />
10+
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
11+
<add key="BuildXL" value="https://pkgs.dev.azure.com/ms/BuildXL/_packaging/BuildXL/nuget/v3/index.json" />
912
</packageSources>
1013
<disabledPackageSources />
1114
</configuration>

PublishToBlob.proj

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

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
SOURCE="${BASH_SOURCE[0]}"
44
while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink

0 commit comments

Comments
 (0)