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: v7.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: v7.0.202
Choose a head ref
14 contributors
Loading
Showing with 597 additions and 302 deletions.
  1. +11 −10 .vsts-ci.yml
  2. +8 −12 NuGet.config
  3. +100 −100 eng/Version.Details.xml
  4. +33 −33 eng/Versions.props
  5. +45 −3 eng/common/generate-locproject.ps1
  6. BIN eng/common/loc/P22DotNetHtmlLocalization.lss
  7. +2 −1 eng/common/templates/job/execute-sdl.yml
  8. +23 −20 eng/common/templates/job/onelocbuild.yml
  9. +12 −2 eng/common/templates/job/publish-build-assets.yml
  10. +5 −2 eng/common/templates/job/source-build.yml
  11. +3 −2 eng/common/templates/job/source-index-stage1.yml
  12. +0 −9 eng/common/templates/jobs/jobs.yml
  13. +7 −5 eng/common/templates/post-build/post-build.yml
  14. +57 −0 eng/common/templates/variables/pool-providers.yml
  15. +3 −3 global.json
  16. +1 −1 .../NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj
  17. +1 −1 src/Assets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj
  18. +1 −1 src/Assets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj
  19. +1 −1 src/Assets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj
  20. +1 −1 src/Assets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj
  21. +1 −1 src/Assets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj
  22. +1 −1 ...toredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj
  23. +1 −1 ...rojects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj
  24. +1 −1 ...s/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj
  25. +1 −1 ...nRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj
  26. +1 −1 ...ts/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj
  27. +1 −0 src/Assets/TestProjects/AppWithLibraryAndRid/LibraryWithRid/NativeCode.cs
  28. +1 −0 src/Assets/TestProjects/AppWithLibraryAndRid/LibraryWithRids/NativeCode.cs
  29. +0 −4 src/Assets/TestProjects/SimpleDependencies/SimpleDependencies.csproj
  30. +4 −0 src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildPropertyParser.cs
  31. +6 −4 src/Cli/dotnet/ReleasePropertyProjectLocator.cs
  32. +1 −1 src/Cli/dotnet/commands/dotnet-pack/PackCommandParser.cs
  33. +1 −1 src/Tasks/Common/Resources/Strings.resx
  34. +2 −2 src/Tasks/Common/Resources/xlf/Strings.cs.xlf
  35. +2 −2 src/Tasks/Common/Resources/xlf/Strings.de.xlf
  36. +2 −2 src/Tasks/Common/Resources/xlf/Strings.es.xlf
  37. +2 −2 src/Tasks/Common/Resources/xlf/Strings.fr.xlf
  38. +2 −2 src/Tasks/Common/Resources/xlf/Strings.it.xlf
  39. +2 −2 src/Tasks/Common/Resources/xlf/Strings.ja.xlf
  40. +2 −2 src/Tasks/Common/Resources/xlf/Strings.ko.xlf
  41. +2 −2 src/Tasks/Common/Resources/xlf/Strings.pl.xlf
  42. +2 −2 src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf
  43. +2 −2 src/Tasks/Common/Resources/xlf/Strings.ru.xlf
  44. +2 −2 src/Tasks/Common/Resources/xlf/Strings.tr.xlf
  45. +2 −2 src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf
  46. +2 −2 src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf
  47. +2 −2 ...xtensions.Tasks/msbuildExtensions-ver/SolutionFile/ImportAfter/Microsoft.NET.Sdk.Solution.targets
  48. +59 −0 src/Tests/Microsoft.NET.Pack.Tests/SolutionPackTests.cs
  49. +44 −14 src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs
  50. +46 −9 src/Tests/Microsoft.NET.TestFramework/EnvironmentInfo.cs
  51. +57 −3 src/Tests/Microsoft.NET.TestFramework/TestAssetsManager.cs
  52. +3 −2 src/Tests/Microsoft.NET.TestFramework/ToolsetInfo.cs
  53. +24 −21 src/Tests/dotnet.Tests/OutputPathOptionTests.cs
  54. +2 −2 src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetPackInvocation.cs
21 changes: 11 additions & 10 deletions .vsts-ci.yml
View file
Original file line number Diff line number Diff line change
@@ -2,16 +2,17 @@ trigger:
batch: true
branches:
include:
- master
- main
- release/7.0.3xx
- internal/release/*

pr:
branches:
include:
- main
- release/*
- internal/release/3.*
- internal/release/5.*
- internal/release/6.*
- internal/release/7.*
paths:
exclude:
- "*.md"
- internal/release/*


variables:
- name: teamName
@@ -158,9 +159,9 @@ stages:
pool:
vmImage: 'macOS-latest'
${{ if eq(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: OSX.1100.Amd64.Open
helixTargetQueue: OSX.1200.Amd64.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: OSX.1100.Amd64
helixTargetQueue: OSX.1200.Amd64
strategy:
matrix:
Build_Release:
20 changes: 8 additions & 12 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
@@ -4,23 +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-febee99" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-febee99d/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-e56abc4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e56abc45/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-6f08c67-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-6f08c67f-1/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-0a2bda1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0a2bda10/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-0a396ac" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0a396aca/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-pub-dotnet-templating-e94bdc5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e94bdc55/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-e94bdc5-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e94bdc55-1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-67c5daf" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-67c5daf1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-0e61925" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0e619254/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-0e61925-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0e619254-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-0e61925-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0e619254-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-27813f8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d/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" />
@@ -42,15 +40,13 @@
<!-- Begin: Package sources from dotnet-templating -->
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-febee99" value="true" />
<add key="darc-int-dotnet-aspnetcore-e56abc4" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-0a2bda1" value="true" />
<add key="darc-int-dotnet-runtime-0a396ac" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-0e61925-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-0e61925-2" value="true" />
<add key="darc-int-dotnet-windowsdesktop-0e61925" value="true" />
<add key="darc-int-dotnet-windowsdesktop-27813f8" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Loading