Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dotnet/sdk
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v6.0.201
Choose a base ref
...
head repository: dotnet/sdk
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v6.0.202
Choose a head ref
14 contributors

Commits on Nov 24, 2021

  1. Merge in 'release/6.0.1xx' changes

    @dotnet-bot
    dotnet-bot committed Nov 24, 2021
    Copy the full SHA
    ea1efa8 View commit details

Commits on Dec 1, 2021

  1. Merge in 'release/6.0.1xx' changes

    @dotnet-bot
    dotnet-bot committed Dec 1, 2021
    Copy the full SHA
    9b8345e View commit details

Commits on Dec 6, 2021

  1. Merge in 'release/6.0.1xx' changes

    @dotnet-bot
    dotnet-bot committed Dec 6, 2021
    Copy the full SHA
    c19a1f8 View commit details

Commits on Dec 7, 2021

  1. Merge in 'release/6.0.1xx' changes

    @dotnet-bot
    dotnet-bot committed Dec 7, 2021
    Copy the full SHA
    a94288f View commit details

Commits on Dec 10, 2021

  1. Merge in 'release/6.0.1xx' changes

    @dotnet-bot
    dotnet-bot committed Dec 10, 2021
    Copy the full SHA
    40cbe14 View commit details

Commits on Dec 11, 2021

  1. Merge in 'release/6.0.1xx' changes

    @dotnet-bot
    dotnet-bot committed Dec 11, 2021
    Copy the full SHA
    5d42ff6 View commit details

Commits on Dec 14, 2021

  1. Merge in 'release/6.0.1xx' changes

    @dotnet-bot
    dotnet-bot committed Dec 14, 2021
    Copy the full SHA
    18bedcd View commit details

Commits on Dec 15, 2021

  1. Merge in 'release/6.0.1xx' changes

    @dotnet-bot
    dotnet-bot committed Dec 15, 2021
    Copy the full SHA
    8f77a9a View commit details

Commits on Dec 17, 2021

  1. Merge in 'release/6.0.1xx' changes

    @dotnet-bot
    dotnet-bot committed Dec 17, 2021
    Copy the full SHA
    354a9d7 View commit details

Commits on Dec 20, 2021

  1. Merge in 'release/6.0.1xx' changes

    @dotnet-bot
    dotnet-bot committed Dec 20, 2021
    Copy the full SHA
    b887c0f View commit details

Commits on Jan 4, 2022

  1. Merge in 'release/6.0.1xx' changes

    @dotnet-bot
    dotnet-bot committed Jan 4, 2022
    Copy the full SHA
    592daea View commit details

Commits on Jan 8, 2022

  1. Merge in 'release/6.0.1xx' changes

    @dotnet-bot
    dotnet-bot committed Jan 8, 2022
    Copy the full SHA
    a48535c View commit details

Commits on Jan 12, 2022

  1. Merged PR 20245: [internal/release/6.0.1xx] Update dependencies from … 

    …dnceng/internal/dotnet-windowsdesktop

This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NET.Sdk.WindowsDesktop**: from 6.0.1-servicing.21567.7 to 6.0.2-servicing.22061.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:258d4206-cc1e-4c20-39b6-08d960f4ca81)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 258d4206-cc1e-4c20-39b6-08d960f4ca81
- **Build**: 20220111.4
- **Date Produced**: January 11, 2022 10:19:52 PM UTC
- **Commit**: f35a8749a4f3c9950cc8bef8c983daf5e85f34e7
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.0-rtm.21523.1 to 6.0.2-servicing.22061.4][35]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.1-servicing.21568.2 to 6.0.2-servicing.22061.4][36]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.1 to 6.0.2][36]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.0 to 6.0.2][35]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.1-servicing.21567.7 to 6.0.2-servicing.22061.3][37]

[35]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC59fea7d&targetVersion=GCf35a874&_a=files
[36]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCef15b55&targetVersion=GCf35a874&_a=files
[37]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC0350d04&targetVersion=GC9bc6a37&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:258d4206-cc1e-4c20-39b6-08d960f4ca81)
    @dotnet-bot @mmitche
    dotnet-bot authored and mmitche committed Jan 12, 2022
    Copy the full SHA
    584f777 View commit details

Commits on Jan 13, 2022

  1. [internal/release/6.0.1xx] Update dependencies from dnceng/internal/d… 

    …otnet-runtime
    @dotnet-bot
    dotnet-bot committed Jan 13, 2022
    Copy the full SHA
    58bed04 View commit details

  2. Merge in 'release/6.0.1xx' changes

    @dotnet-bot
    dotnet-bot committed Jan 13, 2022
    Copy the full SHA
    81daa24 View commit details

  3. Merged PR 20648: [internal/release/6.0.1xx] Update dependencies from … 

    …dnceng/internal/dotnet-templating

This pull request updates the following dependencies

[marker]: <> (Begin:b9edc696-13f4-406c-3a51-08d961c5a689)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- **Subscription**: b9edc696-13f4-406c-3a51-08d961c5a689
- **Build**: 20220112.13
- **Date Produced**: January 13, 2022 6:36:14 AM UTC
- **Commit**: 143563ec863febcc49f198af436602b8eef0ce26
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.TemplateSearch.Common**: [from 6.0.100 to 6.0.102][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.100 to 6.0.102][1]
  - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.100 to 6.0.102][1]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.100-rtm.21523.2 to 6.0.102-servicing.22062.13][1]
  - **Microsoft.TemplateEngine.Utils**: [from 6.0.100 to 6.0.102][1]
  - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.100 to 6.0.102][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC7d94161&targetVersion=GC143563e&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b9edc696-13f4-406c-3a51-08d961c5a689)
    @dotnet-bot @mmitche
    dotnet-bot authored and mmitche committed Jan 13, 2022
    Copy the full SHA
    26e6965 View commit details

Commits on Jan 18, 2022

  1. Build Microsoft.NET.Build.Tasks for netfx (#23266) 

    Required for omnisharp to work with a source-built .NET SDK.

Patch removal issue: #22281

Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
    @MichaelSimons @eerhardt
    MichaelSimons and eerhardt authored Jan 18, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    df5c30d View commit details

  2. Merge in 'release/6.0.1xx' changes

    @dotnet-bot
    dotnet-bot committed Jan 18, 2022
    Copy the full SHA
    e947d1d View commit details

  3. Merged PR 20666: [internal/release/6.0.1xx] Update dependencies from … 

    …dnceng/internal/dotnet-aspnetcore

This pull request updates the following dependencies

[marker]: <> (Begin:ffa022ec-0654-4a20-3a4e-08d961c5a689)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: ffa022ec-0654-4a20-3a4e-08d961c5a689
- **Build**: 20220114.12
- **Date Produced**: January 15, 2022 6:06:16 AM UTC
- **Commit**: 1dcf7acfacf0fe154adcc23270cb0da11ff44ace
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.1 to 6.0.2][3]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.0-rtm.21526.8 to 6.0.2-servicing.22064.12][4]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.0 to 6.0.2][4]
  - **dotnet-user-secrets**: [from 6.0.1-servicing.21567.14 to 6.0.2-servicing.22064.12][3]
  - **dotnet-dev-certs**: [from 6.0.1-servicing.21567.14 to 6.0.2-servicing.22064.12][3]
  - **Microsoft.AspNetCore.Analyzers**: [from 6.0.1-servicing.21567.14 to 6.0.2-servicing.22064.12][3]
  - **Microsoft.CodeAnalysis.Razor**: [from 6.0.1 to 6.0.2][3]
  - **Microsoft.AspNetCore.TestHost**: [from 6.0.1 to 6.0.2][3]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.1-servicing.21567.14 to 6.0.2-servicing.22064.12][3]
  - **Microsoft.JSInterop**: [from 6.0.1 to 6.0.2][3]
  - **Microsoft.Extensions.FileProviders.Embedded**: [from 6.0.1 to 6.0.2][3]
  - **Microsoft.AspNetCore.Razor.Language**: [from 6.0.1 to 6.0.2][3]
  - **Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport**: [from 6.0.1-servicing.21567.14 to 6.0.2-servicing.22064.12][3]
  - **Microsoft.AspNetCore.Components.Web**: [from 6.0.1 to 6.0.2][3]
  - **Microsoft.AspNetCore.Authorization**: [from 6.0.1 to 6.0.2][3]
  - **Microsoft.AspNetCore.Components.Analyzers**: [from 6.0.1 to 6.0.2][3]
  - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: [from 6.0.1 to 6.0.2][3]
  - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 6.0.1-servicing.21567.14 to 6.0.2-servicing.22064.12][3]
  - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 6.0.1-servicing.21567.14 to 6.0.2-servicing.22064.12][3]
  - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 6.0.1-servicing.21567.14 to 6.0.2-servicing.22064.12][3]

[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC4e7d976&targetVersion=GC1dcf7ac&_a=files
[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCae1a6cb&targetVersion=GC1dcf7ac&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:ffa022ec-0654-4a20-3a4e-08d961c5a689)
    @dotnet-bot @mmitche
    dotnet-bot authored and mmitche committed Jan 18, 2022
    Copy the full SHA
    7963c3d View commit details

  4. Merged PR 20664: [internal/release/6.0.1xx] Update dependencies from … 

    …dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:499cebc0-3291-4ec8-3a4f-08d961c5a689)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 499cebc0-3291-4ec8-3a4f-08d961c5a689
- **Build**: 20220114.6
- **Date Produced**: January 14, 2022 10:08:53 PM UTC
- **Commit**: 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.2 to 6.0.2][3]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.2 to 6.0.2][3]
  - **System.IO.Pipelines**: [from 6.0.2 to 6.0.2][3]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.2-servicing.22062.6 to 6.0.2-servicing.22064.6][3]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.2-servicing.22062.6 to 6.0.2-servicing.22064.6][3]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.2 to 6.0.2][3]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.2 to 6.0.2][3]
  - **Microsoft.NET.HostModel**: [from 6.0.2-servicing.22062.6 to 6.0.2-servicing.22064.6][3]

[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC5e9fd16&targetVersion=GC839cdfb&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:499cebc0-3291-4ec8-3a4f-08d961c5a689)
    @dotnet-bot @mmitche
    dotnet-bot authored and mmitche committed Jan 18, 2022
    Copy the full SHA
    d1148c5 View commit details

  5. Merged PR 20683: [internal/release/6.0.1xx] Update dependencies from … 

    …dnceng/internal/dotnet-windowsdesktop

This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NET.Sdk.WindowsDesktop**: from 6.0.2-servicing.22061.3 to 6.0.2-servicing.22064.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:258d4206-cc1e-4c20-39b6-08d960f4ca81)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 258d4206-cc1e-4c20-39b6-08d960f4ca81
- **Build**: 20220114.6
- **Date Produced**: January 15, 2022 6:18:44 AM UTC
- **Commit**: 9fbd3ecd250dda95f93b0123ab017efb1e0e6033
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.2-servicing.22061.4 to 6.0.2-servicing.22064.6][3]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.2-servicing.22061.4 to 6.0.2-servicing.22064.6][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.2 to 6.0.2][3]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.2 to 6.0.2][3]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.2-servicing.22061.3 to 6.0.2-servicing.22064.8][4]

[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCf35a874&targetVersion=GC9fbd3ec&_a=files
[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC9bc6a37&targetVersion=GCfb76229&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:258d4206-cc1e-4c20-39b6-08d960f4ca81)
    @dotnet-bot @mmitche
    dotnet-bot authored and mmitche committed Jan 18, 2022
    Copy the full SHA
    5d04697 View commit details

Commits on Jan 19, 2022

  1. Merged PR 20700: [internal/release/6.0.1xx] Update dependencies from … 

    …dnceng/internal/dotnet-templating

This pull request updates the following dependencies

[marker]: <> (Begin:b9edc696-13f4-406c-3a51-08d961c5a689)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- **Subscription**: b9edc696-13f4-406c-3a51-08d961c5a689
- **Build**: 20220118.7
- **Date Produced**: January 18, 2022 7:41:05 PM UTC
- **Commit**: 0a0300fa1ff7d5c8be96d11383e99b7b5b0e4fb8
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.TemplateSearch.Common**: [from 6.0.102 to 6.0.102][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.102 to 6.0.102][1]
  - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.102 to 6.0.102][1]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.102-servicing.22062.13 to 6.0.102-servicing.22068.7][1]
  - **Microsoft.TemplateEngine.Utils**: [from 6.0.102 to 6.0.102][1]
  - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.102 to 6.0.102][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC143563e&targetVersion=GC0a0300f&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b9edc696-13f4-406c-3a51-08d961c5a689)
    @dotnet-bot @mmitche
    dotnet-bot authored and mmitche committed Jan 19, 2022
    Copy the full SHA
    4c0649a View commit details

Commits on Jan 31, 2022

  1. Switch to 1ES pools for publishing

    @mmitche @marcpopMSFT
    mmitche authored and marcpopMSFT committed Jan 31, 2022
    Copy the full SHA
    c9b682b View commit details

  2. Add pool spec for Publish_Build_Configuration

    @mmitche @marcpopMSFT
    mmitche authored and marcpopMSFT committed Jan 31, 2022
    Copy the full SHA
    aa3c6ac View commit details

Commits on Feb 1, 2022

  1. Update dependencies from https://dev.azure.com/dnceng/internal/_git/d… 

    …otnet-windowsdesktop build 20220201.6

Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0
 From Version 6.0.2 -> To Version 6.0.3
    @dotnet-bot
    dotnet-bot committed Feb 1, 2022
    Copy the full SHA
    1239a3d View commit details

Commits on Feb 2, 2022

  1. Update branding to 6.0.103 (#23703)

    @vseanreesermsft
    vseanreesermsft authored Feb 2, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fbb8b0e View commit details

  2. Merge in 'release/6.0.1xx' changes

    @dotnet-bot
    dotnet-bot committed Feb 2, 2022
    Copy the full SHA
    88f76d3 View commit details

  3. Update dependencies from https://dev.azure.com/dnceng/internal/_git/d… 

    …otnet-windowsdesktop build 20220201.8

VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , Microsoft.WindowsDesktop.App.Runtime.win-x64 , Microsoft.WindowsDesktop.App.Ref
 From Version 6.0.2-servicing.22064.6 -> To Version 6.0.3-servicing.22101.8
    @dotnet-bot
    dotnet-bot committed Feb 2, 2022
    Copy the full SHA
    4646ac2 View commit details

  4. Update dependencies from https://dev.azure.com/dnceng/internal/_git/d… 

    …otnet-windowsdesktop build 20220201.11

VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , Microsoft.WindowsDesktop.App.Runtime.win-x64 , Microsoft.WindowsDesktop.App.Ref
 From Version 6.0.2-servicing.22064.6 -> To Version 6.0.3-servicing.22101.11
    @dotnet-bot
    dotnet-bot committed Feb 2, 2022
    Copy the full SHA
    271f55b View commit details

  5. Merge pull request #23685 from dotnet/marcpopMSFT-pickbuildchanges601 

    Cherry pick build config changes
    @marcpopMSFT
    marcpopMSFT authored Feb 2, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8ab7080 View commit details

  6. Merge in 'release/6.0.1xx' changes

    @dotnet-bot
    dotnet-bot committed Feb 2, 2022
    Copy the full SHA
    69c9538 View commit details

Commits on Feb 3, 2022

  1. Update dependencies from https://github.com/dotnet/arcade build 20220… 

    …202.3 (#23737)

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.SignTool , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21609.4 -> To Version 6.0.0-beta.22102.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
    @dotnet-maestro
    dotnet-maestro[bot] and dotnet-maestro[bot] authored Feb 3, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    aa68f30 View commit details

  2. Merge in 'release/6.0.1xx' changes

    @dotnet-bot
    dotnet-bot committed Feb 3, 2022
    Copy the full SHA
    898c1a1 View commit details

Commits on Feb 4, 2022

  1. Merged PR 20941: [internal/release/6.0.1xx] Update dependencies from … 

    …dnceng/internal/dotnet-windowsdesktop

This pull request updates the following dependencies

[marker]: <> (Begin:258d4206-cc1e-4c20-39b6-08d960f4ca81)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 258d4206-cc1e-4c20-39b6-08d960f4ca81
- **Build**: 20220201.11
- **Date Produced**: February 2, 2022 3:07:16 AM UTC
- **Commit**: 512dd84fb6ff3629f18351271583d13fc0546399
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22101.11][3]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22101.11][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.2 to 6.0.3][3]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.2 to 6.0.3][3]

[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC9fbd3ec&targetVersion=GC512dd84&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:258d4206-cc1e-4c20-39b6-08d960f4ca81)
    @dotnet-bot @marcpopMSFT
    dotnet-bot authored and marcpopMSFT committed Feb 4, 2022
    Copy the full SHA
    35c01fa View commit details

Commits on Feb 7, 2022

  1. Update dependencies from https://github.com/dotnet/roslyn build 20220… 

    …207.2 (#23798)

Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis , Microsoft.Net.Compilers.Toolset , Microsoft.CodeAnalysis.Workspaces.MSBuild
 From Version 4.0.1-1.22053.6 -> To Version 4.0.1-1.22107.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
    @dotnet-maestro
    dotnet-maestro[bot] and dotnet-maestro[bot] authored Feb 7, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    55e7c8e View commit details

  2. Merge in 'release/6.0.1xx' changes

    @dotnet-bot
    dotnet-bot committed Feb 7, 2022
    Copy the full SHA
    94c863e View commit details

  3. Update dependencies from https://github.com/dotnet/roslyn build 20220… 

    …207.6

Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis , Microsoft.Net.Compilers.Toolset , Microsoft.CodeAnalysis.Workspaces.MSBuild
 From Version 4.0.1-1.22107.2 -> To Version 4.0.1-1.22107.6
    @dotnet-maestro
    dotnet-maestro[bot] committed Feb 7, 2022
    Copy the full SHA
    1404850 View commit details

Commits on Feb 8, 2022

  1. Merge pull request #23805 from dotnet/darc-release/6.0.1xx-1af878ec-8… 

    …1c8-4b74-938f-6cc9b84ce4df

[release/6.0.1xx] Update dependencies from dotnet/roslyn
    @v-wuzhai
    v-wuzhai authored Feb 8, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    05e5148 View commit details

  2. Merge in 'release/6.0.1xx' changes

    @dotnet-bot
    dotnet-bot committed Feb 8, 2022
    Copy the full SHA
    71a0583 View commit details

  3. Update dependencies from https://github.com/dotnet/arcade build 20220… 

    …207.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.SignTool , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.22102.3 -> To Version 6.0.0-beta.22107.2
    @dotnet-maestro
    dotnet-maestro[bot] committed Feb 8, 2022
    Copy the full SHA
    71324c0 View commit details

  4. Merge commit '4c0649a412b8865957af7610cc9f035484f4997a' into internal… 

    …-merge-6.0.1xx-2022-02-08-1021
    @vseanreesermsft
    vseanreesermsft committed Feb 8, 2022
    Copy the full SHA
    57f17bd View commit details

Commits on Feb 9, 2022

  1. Merge pull request #23816 from dotnet/darc-release/6.0.1xx-c17382d7-0… 

    …e8b-45b9-a1f9-d999039ccd95

[release/6.0.1xx] Update dependencies from dotnet/arcade
    @v-wuzhai
    v-wuzhai authored Feb 9, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fee4fa7 View commit details

  2. Merge pull request #23821 from vseanreesermsft/internal-merge-6.0.1xx… 

    …-2022-02-08-1021

Merging internal commits for release/6.0.1xx
    @marcpopMSFT
    marcpopMSFT authored Feb 9, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a6ca989 View commit details

  3. Merge in 'release/6.0.1xx' changes

    @dotnet-bot
    dotnet-bot committed Feb 9, 2022
    Copy the full SHA
    ba64dbd View commit details

Commits on Feb 10, 2022

  1. Update 11TestAppWith10CLIToolReferences.csproj

    @marcpopMSFT
    marcpopMSFT authored Feb 10, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    894a4bd View commit details

  2. Update Msbuild.Tests.Utilities.csproj

    @marcpopMSFT
    marcpopMSFT authored Feb 10, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    60668bb View commit details

  3. Update dotnet-outputsframeworkversion-netcoreapp1.0.csproj

    @marcpopMSFT
    marcpopMSFT authored Feb 10, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    693a747 View commit details

  4. Update dotnet-outputsframeworkversion-netcoreapp1.0.csproj

    @marcpopMSFT
    marcpopMSFT authored Feb 10, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8def199 View commit details

  5. Update dependencies from https://github.com/dotnet/roslyn build 20220… 

    …210.1

Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis , Microsoft.Net.Compilers.Toolset , Microsoft.CodeAnalysis.Workspaces.MSBuild
 From Version 4.0.1-1.22107.6 -> To Version 4.0.1-1.22110.1
    @dotnet-maestro
    dotnet-maestro[bot] committed Feb 10, 2022
    Copy the full SHA
    8df0ebf View commit details

Commits on Feb 11, 2022

  1. Update dependencies from https://github.com/dotnet/roslyn build 20220… 

    …210.3

Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis , Microsoft.Net.Compilers.Toolset , Microsoft.CodeAnalysis.Workspaces.MSBuild
 From Version 4.0.1-1.22107.6 -> To Version 4.0.1-1.22110.3
    @dotnet-maestro
    dotnet-maestro[bot] committed Feb 11, 2022
    Copy the full SHA
    fa78c11 View commit details
Showing with 365 additions and 243 deletions.
  1. +9 −8 .vsts-ci.yml
  2. +9 −11 NuGet.config
  3. +108 −108 eng/Version.Details.xml
  4. +31 −32 eng/Versions.props
  5. +19 −0 eng/common/generate-sbom-prep.ps1
  6. +22 −0 eng/common/generate-sbom-prep.sh
  7. +9 −60 eng/common/templates/job/execute-sdl.yml
  8. +10 −0 eng/common/templates/job/job.yml
  9. +1 −1 eng/common/templates/jobs/codeql-build.yml
  10. +0 −4 eng/common/templates/jobs/jobs.yml
  11. +68 −0 eng/common/templates/steps/execute-sdl.yml
  12. +44 −0 eng/common/templates/steps/generate-sbom.yml
  13. +7 −0 eng/common/templates/variables/sdl-variables.yml
  14. +2 −2 global.json
  15. +5 −0 .../dotnet-outputsframeworkversion-netcoreapp1.0/dotnet-outputsframeworkversion-netcoreapp1.0.csproj
  16. +3 −1 src/Assets/TestProjects/11TestAppWith10CLIToolReferences/11TestAppWith10CLIToolReferences.csproj
  17. +3 −0 src/Assets/TestProjects/DesktopAppWithLibrary-NonSDK/TestApp/TestApp.csproj
  18. +3 −0 src/Assets/TestProjects/DesktopAppWithLibrary-PackagesConfig/TestApp/TestApp.csproj
  19. +0 −1 src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj
  20. +0 −1 src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
  21. +0 −1 src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj
  22. +0 −1 src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
  23. +1 −1 src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExeWtihNetStandardLib.cs
  24. +2 −2 src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsRuntimeComponent.cs
  25. +3 −3 src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToReferenceAProject.cs
  26. +2 −2 src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseVB.cs
  27. +1 −2 src/Tests/Microsoft.NET.Restore.Tests/GivenThatWeWantAutomaticTargetingPackReferences.cs
  28. +1 −0 src/Tests/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj
  29. +2 −2 src/Tests/dotnet-watch.Tests/DotNetWatcherTests.cs
17 changes: 9 additions & 8 deletions .vsts-ci.yml
View file
Original file line number Diff line number Diff line change
@@ -55,11 +55,11 @@ stages:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre.Open
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre
helixTargetQueue: Windows.Server.Amd64.VS2019.Pre.Open
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre
helixTargetQueue: Windows.Amd64.VS2022.Pre.Open
strategy:
matrix:
Build_Release:
@@ -83,14 +83,14 @@ stages:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Svc-Public
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre.Open
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre
${{ if eq(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: Windows.Server.Amd64.VS2019.Pre.Open
helixTargetQueue: Windows.Amd64.VS2022.Pre.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: Windows.Server.Amd64.VS2019.Pre.Open
helixTargetQueue: Windows.Amd64.VS2022.Pre
strategy:
matrix:
Build_Debug:
@@ -166,8 +166,9 @@ stages:
publishUsingPipelines: true
dependsOn:
- Windows_NT
- Source_Build_Managed
pool:
name: NetCore1ESPool-Internal
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- template: /eng/common/templates/post-build/post-build.yml
20 changes: 9 additions & 11 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
@@ -4,22 +4,21 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-c911002-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c911002a-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-c911002" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c911002a/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-f9ae0f5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f9ae0f5d/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-ae57d10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-ae57d105/nuget/v3/index.json" />
<add key="darc-pub-DotNet-msbuild-Trusted-a02f736" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a02f7365/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
<!-- End: Package sources from dotnet-roslyn-analyzers -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-c24d9a9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c24d9a9c/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-be98e88" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-be98e88c/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-eeae34e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-eeae34ec/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-65f76a9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-65f76a98/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-1217354" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1217354c/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-167140c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-167140c0/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -37,17 +36,16 @@
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-eeae34e" value="true" />
<add key="darc-int-dotnet-templating-65f76a9" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-c911002" value="true" />
<add key="darc-int-dotnet-aspnetcore-c911002-1" value="true" />
<add key="darc-int-dotnet-aspnetcore-f9ae0f5" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-c24d9a9" value="true" />
<add key="darc-int-dotnet-runtime-be98e88" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-1217354" value="true" />
<add key="darc-int-dotnet-windowsdesktop-167140c" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
216 changes: 108 additions & 108 deletions eng/Version.Details.xml
View file

Large diffs are not rendered by default.

63 changes: 31 additions & 32 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
</PropertyGroup>
<!-- Repo Version Information -->
<PropertyGroup>
<VersionPrefix>6.0.201</VersionPrefix>
<VersionPrefix>6.0.202</VersionPrefix>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
</PropertyGroup>
<!-- Production Dependencies -->
@@ -26,7 +26,7 @@
<NewtonsoftJsonVersion>$(NewtonsoftJsonPackageVersion)</NewtonsoftJsonVersion>
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
<MicrosoftDotNetSignToolVersion>6.0.0-beta.22107.2</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetSignToolVersion>6.0.0-beta.22161.1</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -40,13 +40,13 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>6.0.3</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.3-servicing.22123.9</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.4</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.4-servicing.22164.4</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.3</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>6.0.3-servicing.22123.9</MicrosoftNETHostModelVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>6.0.4-servicing.22164.4</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0-preview.7.21363.9</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<SystemServiceProcessServiceControllerVersion>6.0.0</SystemServiceProcessServiceControllerVersion>
</PropertyGroup>
@@ -75,30 +75,29 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/mono/linker -->
<MicrosoftNETILLinkTasksPackageVersion>6.0.200-1.22122.2</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>6.0.200-1.22124.2</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksPackageVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<SystemCodeDomPackageVersion>6.0.0</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>6.0.0</SystemTextEncodingCodePagesPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>5.0.0-preview.7.20364.11</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemResourcesExtensionsPackageVersion>6.0.0</SystemResourcesExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/format -->
<dotnetformatVersion>6.0.312303</dotnetformatVersion>
<dotnetformatVersion>6.2.315104</dotnetformatVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
<MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0</MicrosoftCodeAnalysisNetAnalyzersVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
<MicrosoftBuildPackageVersion>17.1.0</MicrosoftBuildPackageVersion>
<MicrosoftBuildPackageVersion>17.1.1</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
<MicrosoftBuildLocalizationPackageVersion>17.1.0-preview-22076-09</MicrosoftBuildLocalizationPackageVersion>
<MicrosoftBuildLocalizationPackageVersion>17.1.1-preview-22124-06</MicrosoftBuildLocalizationPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
<MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>
@@ -109,44 +108,44 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/templating -->
<MicrosoftTemplateEngineCliPackageVersion>6.0.201-servicing.22123.7</MicrosoftTemplateEngineCliPackageVersion>
<MicrosoftTemplateEngineAbstractionsPackageVersion>6.0.201</MicrosoftTemplateEngineAbstractionsPackageVersion>
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>6.0.201</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
<MicrosoftTemplateEngineUtilsPackageVersion>6.0.201</MicrosoftTemplateEngineUtilsPackageVersion>
<MicrosoftTemplateSearchCommonPackageVersion>6.0.201</MicrosoftTemplateSearchCommonPackageVersion>
<MicrosoftTemplateEngineCliPackageVersion>6.0.202-servicing.22165.5</MicrosoftTemplateEngineCliPackageVersion>
<MicrosoftTemplateEngineAbstractionsPackageVersion>6.0.202</MicrosoftTemplateEngineAbstractionsPackageVersion>
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>6.0.202</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
<MicrosoftTemplateEngineUtilsPackageVersion>6.0.202</MicrosoftTemplateEngineUtilsPackageVersion>
<MicrosoftTemplateSearchCommonPackageVersion>6.0.202</MicrosoftTemplateSearchCommonPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/Microsoft/visualfsharp -->
<MicrosoftFSharpCompilerPackageVersion>12.0.1-beta.22057.4</MicrosoftFSharpCompilerPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>4.1.0-5.22116.13</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>4.1.0-5.22116.13</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.1.0-5.22116.13</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.1.0-5.22116.13</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.1.0-5.22116.13</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.1.0-5.22116.13</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.1.0-5.22128.4</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>4.1.0-5.22128.4</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.1.0-5.22128.4</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.1.0-5.22128.4</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.1.0-5.22128.4</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.1.0-5.22128.4</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>6.0.3-servicing.22124.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>6.0.3</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>6.0.3-servicing.22124.1</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>6.0.3-servicing.22124.1</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>6.0.3-servicing.22124.1</MicrosoftAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreTestHostPackageVersion>6.0.3</MicrosoftAspNetCoreTestHostPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>6.0.4-servicing.22172.4</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>6.0.4</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>6.0.4-servicing.22172.4</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>6.0.4-servicing.22172.4</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>6.0.4-servicing.22172.4</MicrosoftAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreTestHostPackageVersion>6.0.4</MicrosoftAspNetCoreTestHostPackageVersion>
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>6.0.2-1.22115.2</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
<MicrosoftCodeAnalysisRazorToolingInternalVersion>6.0.2-1.22115.2</MicrosoftCodeAnalysisRazorToolingInternalVersion>
<MicrosoftAspNetCoreRazorSourceGeneratorToolingInternalPackageVersion>6.0.2-1.22115.2</MicrosoftAspNetCoreRazorSourceGeneratorToolingInternalPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/wpf -->
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.3-servicing.22124.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.4-servicing.22165.3</MicrosoftNETSdkWindowsDesktopPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.3-servicing.22124.3</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.4-servicing.22165.2</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
</PropertyGroup>
<PropertyGroup Label="Manually updated">
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
@@ -164,7 +163,7 @@
<PropertyGroup>
<FluentAssertionsVersion>4.19.2</FluentAssertionsVersion>
<FluentAssertionsJsonVersion>4.19.0</FluentAssertionsJsonVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22107.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22161.1</MicrosoftDotNetXUnitExtensionsVersion>
<MoqPackageVersion>4.8.2</MoqPackageVersion>
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>6.0.0-beta.21376.2</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
</PropertyGroup>
19 changes: 19 additions & 0 deletions eng/common/generate-sbom-prep.ps1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Param(
[Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed
)

Write-Host "Creating dir $ManifestDirPath"
# create directory for sbom manifest to be placed
if (!(Test-Path -path $ManifestDirPath))
{
New-Item -ItemType Directory -path $ManifestDirPath
Write-Host "Successfully created directory $ManifestDirPath"
}
else{
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
}

Write-Host "Updating artifact name"
$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_'
Write-Host "Artifact name $artifact_name"
Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name"
22 changes: 22 additions & 0 deletions eng/common/generate-sbom-prep.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/usr/bin/env bash

source="${BASH_SOURCE[0]}"

manifest_dir=$1

if [ ! -d "$manifest_dir" ] ; then
mkdir -p "$manifest_dir"
echo "Sbom directory created." $manifest_dir
else
Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder."
fi

artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
echo "Artifact name before : "$artifact_name
# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
echo "Artifact name after : "$safe_artifact_name
export ARTIFACT_NAME=$safe_artifact_name
echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name"

exit 0
69 changes: 9 additions & 60 deletions eng/common/templates/job/execute-sdl.yml
View file
Original file line number Diff line number Diff line change
@@ -43,14 +43,9 @@ jobs:
value: ${{ parameters.AzDOPipelineId }}
- name: AzDOBuildId
value: ${{ parameters.AzDOBuildId }}
# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
# sync with the packages.config file.
- name: DefaultGuardianVersion
value: 0.110.1
- template: /eng/common/templates/variables/sdl-variables.yml
- name: GuardianVersion
value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
- name: GuardianPackagesConfigFile
value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
pool:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
@@ -126,57 +121,11 @@ jobs:
displayName: Extract Archive Artifacts
continueOnError: ${{ parameters.sdlContinueOnError }}

- ${{ if ne(parameters.overrideGuardianVersion, '') }}:
- powershell: |
$content = Get-Content $(GuardianPackagesConfigFile)
Write-Host "packages.config content was:`n$content"
$content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)')
$content | Set-Content $(GuardianPackagesConfigFile)
Write-Host "packages.config content updated to:`n$content"
displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }}
- task: NuGetToolInstaller@1
displayName: 'Install NuGet.exe'
- task: NuGetCommand@2
displayName: 'Install Guardian'
inputs:
restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
feedsToUse: config
nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config
externalFeedCredentials: GuardianConnect
restoreDirectory: $(Build.SourcesDirectory)\.packages

- ${{ if ne(parameters.overrideParameters, '') }}:
- powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }}
displayName: Execute SDL
continueOnError: ${{ parameters.sdlContinueOnError }}
- ${{ if eq(parameters.overrideParameters, '') }}:
- powershell: ${{ parameters.executeAllSdlToolsScript }}
-GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion)
-NugetPackageDirectory $(Build.SourcesDirectory)\.packages
-AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
${{ parameters.additionalParameters }}
displayName: Execute SDL
continueOnError: ${{ parameters.sdlContinueOnError }}

- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}:
# We want to publish the Guardian results and configuration for easy diagnosis. However, the
# '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default
# tooling files. Some of these files are large and aren't useful during an investigation, so
# exclude them by simply deleting them before publishing. (As of writing, there is no documented
# way to selectively exclude a dir from the pipeline artifact publish task.)
- task: DeleteFiles@1
displayName: Delete Guardian dependencies to avoid uploading
inputs:
SourceFolder: $(Agent.BuildDirectory)/.gdn
Contents: |
c
i
condition: succeededOrFailed()
- publish: $(Agent.BuildDirectory)/.gdn
artifact: GuardianConfiguration
displayName: Publish GuardianConfiguration
condition: succeededOrFailed()
- template: /eng/common/templates/steps/execute-sdl.yml
parameters:
overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }}
executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }}
overrideParameters: ${{ parameters.overrideParameters }}
additionalParameters: ${{ parameters.additionalParameters }}
publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }}
sdlContinueOnError: ${{ parameters.sdlContinueOnError }}
10 changes: 10 additions & 0 deletions eng/common/templates/job/job.yml
View file
Original file line number Diff line number Diff line change
@@ -31,6 +31,10 @@ parameters:
name: ''
preSteps: []
runAsPublic: false
# Sbom related params
enableSbom: true
PackageVersion: 6.0.0
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'

jobs:
- job: ${{ parameters.name }}
@@ -247,3 +251,9 @@ jobs:
ArtifactName: AssetManifests
continueOnError: ${{ parameters.continueOnError }}
condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))

- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
- template: /eng/common/templates/steps/generate-sbom.yml
parameters:
PackageVersion: ${{ parameters.packageVersion}}
BuildDropPath: ${{ parameters.buildDropPath }}
2 changes: 1 addition & 1 deletion eng/common/templates/jobs/codeql-build.yml
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ jobs:
# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
# sync with the packages.config file.
- name: DefaultGuardianVersion
value: 0.109.0
value: 0.110.1
- name: GuardianPackagesConfigFile
value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
- name: GuardianVersion
4 changes: 0 additions & 4 deletions eng/common/templates/jobs/jobs.yml
View file
Original file line number Diff line number Diff line change
@@ -8,10 +8,6 @@ parameters:
# Optional: Enable publishing using release pipelines
enablePublishUsingPipelines: false

# Optional: Disable component governance detection. In general, component governance
# should be on for all jobs. Use only in the event of issues.
disableComponentGovernance: false

# Optional: Enable running the source-build jobs to build repo from source
enableSourceBuild: false

68 changes: 68 additions & 0 deletions eng/common/templates/steps/execute-sdl.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
parameters:
overrideGuardianVersion: ''
executeAllSdlToolsScript: ''
overrideParameters: ''
additionalParameters: ''
publishGuardianDirectoryToPipeline: false
sdlContinueOnError: false
condition: ''

steps:
- ${{ if ne(parameters.overrideGuardianVersion, '') }}:
- powershell: |
$content = Get-Content $(GuardianPackagesConfigFile)
Write-Host "packages.config content was:`n$content"
$content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)')
$content | Set-Content $(GuardianPackagesConfigFile)
Write-Host "packages.config content updated to:`n$content"
displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }}
- task: NuGetToolInstaller@1
displayName: 'Install NuGet.exe'

- task: NuGetCommand@2
displayName: 'Install Guardian'
inputs:
restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
feedsToUse: config
nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config
externalFeedCredentials: GuardianConnect
restoreDirectory: $(Build.SourcesDirectory)\.packages

- ${{ if ne(parameters.overrideParameters, '') }}:
- powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }}
displayName: Execute SDL
continueOnError: ${{ parameters.sdlContinueOnError }}
condition: ${{ parameters.condition }}

- ${{ if eq(parameters.overrideParameters, '') }}:
- powershell: ${{ parameters.executeAllSdlToolsScript }}
-GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion)
-NugetPackageDirectory $(Build.SourcesDirectory)\.packages
-AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
${{ parameters.additionalParameters }}
displayName: Execute SDL
continueOnError: ${{ parameters.sdlContinueOnError }}
condition: ${{ parameters.condition }}

- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}:
# We want to publish the Guardian results and configuration for easy diagnosis. However, the
# '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default
# tooling files. Some of these files are large and aren't useful during an investigation, so
# exclude them by simply deleting them before publishing. (As of writing, there is no documented
# way to selectively exclude a dir from the pipeline artifact publish task.)
- task: DeleteFiles@1
displayName: Delete Guardian dependencies to avoid uploading
inputs:
SourceFolder: $(Agent.BuildDirectory)/.gdn
Contents: |
c
i
condition: succeededOrFailed()
- publish: $(Agent.BuildDirectory)/.gdn
artifact: GuardianConfiguration
displayName: Publish GuardianConfiguration
condition: succeededOrFailed()
44 changes: 44 additions & 0 deletions eng/common/templates/steps/generate-sbom.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated.
# PackageName - The name of the package this SBOM represents.
# PackageVersion - The version of the package this SBOM represents.
# ManifestDirPath - The path of the directory where the generated manifest files will be placed

parameters:
PackageVersion: 6.0.0
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
PackageName: '.NET'
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
sbomContinueOnError: true

steps:
- task: PowerShell@2
displayName: Prep for SBOM generation in (Non-linux)
condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin'))
inputs:
filePath: ./eng/common/generate-sbom-prep.ps1
arguments: ${{parameters.manifestDirPath}}

# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461
- script: |
chmod +x ./eng/common/generate-sbom-prep.sh
./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}}
displayName: Prep for SBOM generation in (Linux)
condition: eq(variables['Agent.Os'], 'Linux')
continueOnError: ${{ parameters.sbomContinueOnError }}

- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
displayName: 'Generate SBOM manifest'
continueOnError: ${{ parameters.sbomContinueOnError }}
inputs:
PackageName: ${{ parameters.packageName }}
BuildDropPath: ${{ parameters.buildDropPath }}
PackageVersion: ${{ parameters.packageVersion }}
ManifestDirPath: ${{ parameters.manifestDirPath }}

- task: PublishPipelineArtifact@1
displayName: Publish SBOM manifest
continueOnError: ${{parameters.sbomContinueOnError}}
inputs:
targetPath: '${{parameters.manifestDirPath}}'
artifactName: $(ARTIFACT_NAME)

7 changes: 7 additions & 0 deletions eng/common/templates/variables/sdl-variables.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
variables:
# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
# sync with the packages.config file.
- name: DefaultGuardianVersion
value: 0.110.1
- name: GuardianPackagesConfigFile
value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
4 changes: 2 additions & 2 deletions global.json
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22107.2",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22107.2"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22161.1",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22161.1"
}
}
5 changes: 5 additions & 0 deletions ...outputsframeworkversion-netcoreapp1.0/dotnet-outputsframeworkversion-netcoreapp1.0.csproj
View file
Original file line number Diff line number Diff line change
@@ -7,4 +7,9 @@
<OutputType>Exe</OutputType>
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Net.Security" Version="4.3.1" />
</ItemGroup>
</Project>
4 changes: 3 additions & 1 deletion ...ets/TestProjects/11TestAppWith10CLIToolReferences/11TestAppWith10CLIToolReferences.csproj
View file
Original file line number Diff line number Diff line change
@@ -9,5 +9,7 @@

<ItemGroup>
<DotNetCliToolReference Include="dotnet-outputsframeworkversion-netcoreapp1.0" Version="1.0.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Net.Security" Version="4.3.1" />
</ItemGroup>
</Project>
</Project>
3 changes: 3 additions & 0 deletions src/Assets/TestProjects/DesktopAppWithLibrary-NonSDK/TestApp/TestApp.csproj
View file
Original file line number Diff line number Diff line change
@@ -43,6 +43,9 @@
<ItemGroup>
<Compile Include="**\*.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
3 changes: 3 additions & 0 deletions src/Assets/TestProjects/DesktopAppWithLibrary-PackagesConfig/TestApp/TestApp.csproj
View file
Original file line number Diff line number Diff line change
@@ -97,6 +97,9 @@
<Compile Include="**\*.cs" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
1 change: 0 additions & 1 deletion src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@

<PropertyGroup>
<TargetFrameworks>net6.0;net472</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
<IsPackable>true</IsPackable>
<IsShippingPackage>true</IsShippingPackage>
<StrongNameKeyId>Open</StrongNameKeyId>
1 change: 0 additions & 1 deletion ...ompatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@

<PropertyGroup>
<TargetFrameworks>net6.0;net472</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
<StrongNameKeyId>Open</StrongNameKeyId>
</PropertyGroup>

1 change: 0 additions & 1 deletion src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@
<OutputType>Library</OutputType>
<RootNamespace>Microsoft.NET.Build.Tasks</RootNamespace>
<TargetFrameworks>$(SdkTargetFramework);net472</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(SdkTargetFramework)</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
1 change: 0 additions & 1 deletion src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,6 @@
<Description>The MSBuild targets and properties for building .NET Core projects.</Description>
<OutputType>Library</OutputType>
<TargetFrameworks>$(SdkTargetFramework);net472</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(SdkTargetFramework)</TargetFrameworks>
<Nullable>annotations</Nullable>
</PropertyGroup>

2 changes: 1 addition & 1 deletion src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExeWtihNetStandardLib.cs
View file
Original file line number Diff line number Diff line change
@@ -253,7 +253,7 @@ public void It_resolves_conflicts(bool isSdk, bool usePackagesConfig)
.Should()
.Pass()
.And
.NotHaveStdOutContaining("warning")
.NotHaveStdOutContaining("duplicate")
.And
.HaveStdOutContainingIgnoreCase(successMessage);

4 changes: 2 additions & 2 deletions src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsRuntimeComponent.cs
View file
Original file line number Diff line number Diff line change
@@ -204,7 +204,7 @@ static void Main(string[] args)
.HaveStdOut("(0, 0)");
}

[FullMSBuildOnlyFact]
[FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/24326")]
public void WinMDInteropProjectCanBeReferenced()
{

@@ -241,7 +241,7 @@ public void WinMDInteropProjectCanBeReferenced()
};

consoleApp.ReferencedProjects.Add(projectionProject);
consoleApp.PackageReferences.Add(new TestPackageReference("Microsoft.VCRTForwarders.140", "1.0.6"));
consoleApp.PackageReferences.Add(new TestPackageReference("Microsoft.VCRTForwarders.140", "1.0.7"));

// Workaround for PrivateAssets
consoleApp.PackageReferences.Add(new TestPackageReference("Microsoft.Windows.CsWinRT", "1.2.3"));
6 changes: 3 additions & 3 deletions src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToReferenceAProject.cs
View file
Original file line number Diff line number Diff line change
@@ -67,9 +67,9 @@ public void It_checks_for_valid_platform_references(string referencerTarget, str
[InlineData("netcoreapp1.1;net45", true, "netstandard1.4", true, false, false)]
[InlineData("netcoreapp1.1;net46", true, "net45;netstandard1.6", true, true, true)]
[InlineData("netcoreapp1.1;net45", true, "net46;netstandard1.6", true, false, false)]
[InlineData("v4.5", false, "netstandard1.6", true, true, false)]
[InlineData("v4.6.1", false, "netstandard1.6;net461", true, true, true)]
[InlineData("v4.5", false, "netstandard1.6;net461", true, true, false)]
[InlineData("v4.5.2", false, "netstandard1.6", true, true, false)]
[InlineData("v4.7.2", false, "netstandard1.6;net472", true, true, true)]
[InlineData("v4.5.2", false, "netstandard1.6;net472", true, true, false)]
public void It_checks_for_valid_references(string referencerTarget, bool referencerIsSdkProject,
string dependencyTarget, bool dependencyIsSdkProject,
bool restoreSucceeds, bool buildSucceeds)
4 changes: 2 additions & 2 deletions src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseVB.cs
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ private enum VBRuntime
}

[Theory]
[InlineData("net45", true)]
[InlineData("net472", true)]
[InlineData("netstandard2.0", false)]
[InlineData("netcoreapp2.1", true)]
[InlineData("netcoreapp3.0", true)]
@@ -105,7 +105,7 @@ private static (VBRuntime, string[]) GetExpectedOutputs(string targetFramework,
{
switch ((targetFramework, isExe))
{
case ("net45", true):
case ("net472", true):
var files = new[]
{
"HelloWorld.exe",
3 changes: 1 addition & 2 deletions src/Tests/Microsoft.NET.Restore.Tests/GivenThatWeWantAutomaticTargetingPackReferences.cs
View file
Original file line number Diff line number Diff line change
@@ -22,10 +22,9 @@ public GivenThatWeWantAutomaticTargetingPackReferences(ITestOutputHelper log) :
}

[Theory]
[InlineData("3.5")]
[InlineData("4.7.1")]
[InlineData("4.7.2")]
[InlineData("4.5.1")]
[InlineData("4.5.2")]
[InlineData("4.8")]
public void It_restores_net_framework_project_successfully(string version)
{
1 change: 1 addition & 0 deletions src/Tests/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj
View file
Original file line number Diff line number Diff line change
@@ -19,5 +19,6 @@
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/Tests/dotnet-watch.Tests/DotNetWatcherTests.cs
View file
Original file line number Diff line number Diff line change
@@ -130,7 +130,7 @@ public async Task RunsWithRestoreIfCsprojChanges()
Assert.Equal(messagePrefix + " --no-restore -- wait", message.Trim());
}

[CoreMSBuildOnlyFact]
[Fact(Skip = "https://github.com/dotnet/sdk/issues/24406")]
public async Task Run_WithHotReloadEnabled_ReadsLaunchSettings()
{
var testAsset = _testAssetsManager.CopyTestAsset("WatchAppWithLaunchSettings")
@@ -146,7 +146,7 @@ public async Task Run_WithHotReloadEnabled_ReadsLaunchSettings()
await app.Process.GetOutputLineAsync("Environment: Development", TimeSpan.FromSeconds(10));
}

[CoreMSBuildOnlyFact]
[Fact(Skip = "https://github.com/dotnet/sdk/issues/24406")]
public async Task Run_WithHotReloadEnabled_ReadsLaunchSettings_WhenUsingProjectOption()
{
var testAsset = _testAssetsManager.CopyTestAsset("WatchAppWithLaunchSettings")