Skip to content

Commit b61091e

Browse files
Merge dev into darc-dev-c1e108ce-448b-44c9-92d7-16337e6e60c8
2 parents 924dac2 + 28eeb09 commit b61091e

75 files changed

Lines changed: 2199 additions & 1758 deletions

File tree

Some content is hidden

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

.github/copilot-instructions.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
1-
Use the following coding guidelines: https://github.com/NuGet/NuGet.Client/blob/dev/docs/coding-guidelines.md
1+
# Instructions
2+
3+
When creating pull requests, always follow the [PR template](PULL_REQUEST_TEMPLATE.md).
4+
5+
Use the following coding guidelines: https://github.com/NuGet/NuGet.Client/blob/dev/docs/coding-guidelines.md
6+
7+
Always format before submitting a pull request.
8+
9+
Never use reflection.

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
*.nuget.targets
33
*.nuget.props
44

5+
# Backup files
6+
*.bak
7+
58
# Project K
69
project.lock.json
710
artifacts/

CONTRIBUTING.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Contributing
22

3+
This repo's official location is <https://github.com/NuGet/NuGet.Client>.
4+
The NuGet team does not accept pull requests in other locations, but security issues must follow the [security process](SECURITY.md).
5+
36
This project welcomes contributions and suggestions.
47
Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution.
58
For details, visit https://cla.dotnetfoundation.org/.

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
1919

2020
For how to contribute to this repo follow the [Contributing doc](CONTRIBUTING.md).
2121

22+
This repo's official location is <https://github.com/NuGet/NuGet.Client>.
23+
The NuGet team does not accept pull requests in other locations, but security issues must follow the [security process](SECURITY.md).
24+
2225
## NuGet/Home repo
2326

2427
The [NuGet/Home](https://github.com/nuget/Home) repo is the starting point for all things NuGet. It has the [issue tracker](https://github.com/nuget/home/issues) and [basic information](https://github.com/nuget/home) about all things NuGet. Make sure to consult it before beginning your journey through NuGet code.

build/DotNetSdkTestVersions.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Each line represents arguments for the .NET SDK installer script (https://learn.microsoft.com/dotnet/core/tools/dotnet-install-script)
2-
-Channel 10.0.1xx -Quality daily
3-
-Channel 9.0 -Runtime dotnet
2+
# To make sure that the right version of dotnet.exe (and maybe other files) is used, always install from lowest version to highest version
43
-Channel 8.0 -Runtime dotnet
4+
-Channel 9.0 -Runtime dotnet
5+
-Channel 10.0.1xx -Version 10.0.100-rc.2.25465.104

build/config.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<!-- ** Change for each new preview/rc -->
2121
<!-- Check the VS schedule and manually enter a preview number here that makes sense. -->
2222
<!-- Preview 3 is typically the last "main branch" preview, so we start using rc at this time -->
23-
<ReleaseLabel Condition=" '$(ReleaseLabel)' == '' ">preview.2</ReleaseLabel>
23+
<ReleaseLabel Condition=" '$(ReleaseLabel)' == '' ">rc</ReleaseLabel>
2424

2525
<IsEscrowMode Condition="'$(IsEscrowMode)' == ''">false</IsEscrowMode>
2626

eng/pipelines/compliance.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@ jobs:
4646
softwareVersionNum: "$(Build.BuildId)"
4747
isLargeApp: true
4848
toolVersion: "Latest"
49+
azureSubscription: 'VSEng-APIScanSC'
4950
env:
50-
AzureServicesAuthConnectionString: RunAs=App;AppId=$(ApiScanClientId)
51+
AzureServicesAuthConnectionString: RunAs=App;AppId=d318cba7-db4d-4fb3-99e1-01879cb74e91;TenantId=72f988bf-86f1-41af-91ab-2d7cd011db47;ServiceConnectionId=93e24264-c5e6-4681-8175-ec8a41668480;
52+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
5153

5254
- task: SdtReport@1
5355
displayName: "Generate Analysis Report"

eng/pipelines/optprof.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,13 @@ stages:
166166
- task: MicroBuildBuildVSBootstrapper@3
167167
displayName: 'Build a Visual Studio bootstrapper'
168168
inputs:
169+
azureSubscription: 'VSEng-VSDrop-MI'
169170
channelName: "$(VsTargetChannel)"
170171
vsMajorVersion: "$(VsTargetMajorVersion)"
171172
manifests: '$(Pipeline.Workspace)\ComponentBuildUnderTest\VS15\Microsoft.VisualStudio.NuGet.Core.vsman'
172173
outputFolder: '$(Pipeline.Workspace)\ComponentBuildUnderTest\VS15'
174+
env:
175+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
173176
- task: PowerShell@2
174177
displayName: Set 'VisualStudio.InstallationUnderTest.BootstrapperURL'
175178
inputs:

0 commit comments

Comments
 (0)