Merge branch 'main' into finalizer-csharp

Author: ViktorHofer

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "microsoft.dotnet.darc": {
-      "version": "1.1.0-beta.25128.5",
+      "version": "1.1.0-beta.25161.2",
       "commands": [
         "darc"
       ]

.github/copilot-instructions.md

@@ -0,0 +1,15 @@
+Coding Style and Changes:
+- Code should match the style of the file it's in.
+- Changes should be minimal to resolve a problem in a clean way.
+- User-visible changes to behavior should be considered carefully before committing. They should always be flagged.
+
+Testing:
+- Large changes should always include test changes.
+- The Skip parameter of the Fact attribute to point to the specific issue link.
+
+Output Considerations:
+- When considering how output should look, solicit advice from baronfel.
+
+Localization:
+- Avoid modifying .xlf files and instead prompt the user to update them using the `/t:UpdateXlf` target on MSBuild.
+- Consider localizing strings in .resx files when possible.

.github/workflows/remove-lockdown-label.yml

@@ -0,0 +1,74 @@
+name: Remove Lockdown Label from PRs
+
+on:
+  pull_request:
+    types: [closed]
+
+permissions:
+    actions: write
+    pull-requests: write
+
+jobs:
+    remove-labels:
+        if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'Branding')
+        runs-on: ubuntu-latest
+        steps:
+        -   name: Checkout repository
+            uses: actions/checkout@v2
+
+        -   name: PR's only change is <VersionFeature> in eng/Versions.props
+            id: only_version_feature_changed
+            uses: actions/github-script@v4
+            with:
+                script: |
+                    const otherChangesMessage = "❌ Changes in eng/Versions.props other than <VersionFeature> found";
+                    const onlyVersionFeatureMessage = "✅ PR's only change is <VersionFeature> in eng/Versions.props";
+                    const prNumber = context.payload.pull_request.number;
+                    const { data: files } = await github.pulls.listFiles({
+                        owner: context.repo.owner,
+                        repo: context.repo.repo,
+                        pull_number: prNumber
+                    });
+                    // If files other than eng/Versions.props are changed, output message and exit
+                    if (files.some(file => file.filename !== "eng/Versions.props")) {
+                        console.log(otherChangesMessage);
+                        core.exportVariable("only_version_feature_changed", "false");
+                        return;
+                    }
+                    // Iterate through the patch of eng/Versions.props to check for changes other than <VersionFeature>
+                    const versionsPropsFile = files.find(file => file.filename === "eng/Versions.props");
+                    const patchLines = versionsPropsFile.patch.split("\n").filter(l => l.startsWith("+") || l.startsWith("-"));
+                    for (const line of patchLines) {
+                        if (!line.includes("<VersionFeature>")) {
+                            console.log(otherChangesMessage);
+                            core.exportVariable("only_version_feature_changed", "false");
+                            return;
+                        }
+                    }
+                    console.log(onlyVersionFeatureMessage);
+                    core.exportVariable("only_version_feature_changed", "true");
+
+        -   name: Remove Branch Lockdown label from other PRs targeting this branch
+            if: steps.only_version_feature_changed.outputs.only_version_feature_changed == 'true'
+            uses: actions/github-script@v4
+            with:
+                script: |
+                    const prs = await github.pulls.list({
+                        owner: context.repo.owner,
+                        repo: context.repo.repo,
+                        state: 'open',
+                        base: github.event.pull_request.base.ref,
+                        per_page: 300
+                    });
+                    const filtered_prs = prs.data
+                        .filter(pr => pr.number !== github.context.payload.pull_request.number)
+                        .filter(pr => pr.labels.map(label => label.name).includes('Branch Lockdown'));
+                    for (const pr of filtered_prs) {
+                        await github.issues.removeLabel({
+                            owner: context.repo.owner,
+                            repo: context.repo.repo,
+                            issue_number: pr.number,
+                            name: 'Branch Lockdown'
+                        });
+                        console.log(`Removed Branch Lockdown label from PR #${pr.number}`);
+                    }

Directory.Build.props

@@ -31,6 +31,13 @@
     <IsDebianBaseDistro Condition="$(HostRid.StartsWith('ubuntu')) OR $(HostRid.StartsWith('debian'))">true</IsDebianBaseDistro>
     <IsRPMBasedDistro Condition="$(HostRid.StartsWith('rhel'))">true</IsRPMBasedDistro>
     <IsRPMBasedDistro Condition="$(HostRid.StartsWith('centos'))">true</IsRPMBasedDistro>
+
+    <OSName Condition="'$(OSName)' == '' AND $(Rid) != ''">$(Rid.Substring(0, $(Rid.LastIndexOf('-'))))</OSName>
+    <OSName Condition="'$(OSName)' == ''">$(HostOSName)</OSName>
+    <Rid>$(OSName)-$(Architecture)</Rid>
+    <ProductMonikerRid Condition="'$(ProductMonikerRid)' == ''">$(Rid)</ProductMonikerRid>
+
+    <PgoTerm Condition="'$(PgoInstrument)' == 'true'">-pgo</PgoTerm>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -53,6 +60,7 @@
 
   <PropertyGroup>
     <SdkSrcRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src'))</SdkSrcRoot>
+    <PackageProjectUrl>https://github.com/dotnet/sdk</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <LangVersion>Latest</LangVersion>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>

Directory.Packages.props

@@ -67,8 +67,10 @@
     <PackageVersion Include="Microsoft.TestPlatform.Build" Version="$(MicrosoftTestPlatformBuildPackageVersion)" />
     <PackageVersion Include="Microsoft.TestPlatform.CLI" Version="$(MicrosoftTestPlatformCLIPackageVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.4.16" />
+    <PackageVersion Include="Microsoft.VisualStudio.Sdk" Version="17.2.32505.173" />
+    <PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.11.435" />
     <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
-    <PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.28" />
+    <PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="$(MicrosoftVisualStudioSolutionPersistenceVersion)" />
     <PackageVersion Include="Microsoft.Web.Deployment" Version="$(WebDeploymentPackageVersion)" />
     <PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
     <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />

NuGet.config

@@ -25,6 +25,8 @@
     <add key="dotnet-tools-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json" />
     <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
     <add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
+    <add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
+    <add key="vssdk-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk-archived/nuget/v3/index.json" />
     <add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
     <!-- Used for Rich Navigation indexing task -->
     <add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />