Skip to content

Sync mirror changes into release/dev17.14 #18593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: release/dev17.14
Choose a base branch
from
Open

Sync mirror changes into release/dev17.14 #18593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b5a80b4
Enable internal feed
KevinRansom Apr 25, 2025
9513755
msbuild-trusted
KevinRansom Apr 26, 2025
866b140
baseline
KevinRansom Apr 27, 2025
e363d79
Merged PR 49559: Final release/dev17.14 nuget patch
Apr 28, 2025
d7f44d1
rel/d17.14
KevinRansom Apr 30, 2025
c1a9d78
Merged PR 49644: Final #r nuget update rel/d17.14
Apr 30, 2025
6593f30
Merge remote-tracking branch 'mirror/release/dev17.14' into release/d…
T-Gro May 22, 2025
da22a79
Apply suggestions from code review
T-Gro Jun 3, 2025
e59a922
Update msbuild dependencies using darc
ellahathaway Jun 10, 2025
c9ff0c0
Update msbuild dependencies to 17.13.26 using darc
ellahathaway Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-0ca03f8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-0ca03f84/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand Down
2 changes: 2 additions & 0 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ extends:
enablePublishBuildAssets: true
enablePublishUsingPipelines: $(_PublishUsingPipelines)
enableSourceBuild: true
sourceBuildParameters:
enableInternalSources: true
enableTelemetry: true
helixRepo: dotnet/fsharp
jobs:
Expand Down
2 changes: 1 addition & 1 deletion eng/SourceBuildPrebuiltBaseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
</IgnorePatterns>

<Usages>
<Usage Id="System.Formats.Asn1" Version="8.0.1" />
<Usage Id="System.Formats.Asn1" Version="8.0.1"/>
</Usages>
</UsageData>
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,26 @@
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.22-preview-25174-08">
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.26-preview-25272-04">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>0ca03f84b7848ce9d7d3e5d1f68c5e090efa4f30</Sha>
<Sha>c192adbb5252264481e8c046a8e0694f7fc7855b</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.13.22">
<Dependency Name="Microsoft.Build" Version="17.13.26">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>0ca03f84b7848ce9d7d3e5d1f68c5e090efa4f30</Sha>
<Sha>c192adbb5252264481e8c046a8e0694f7fc7855b</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Framework" Version="17.13.22">
<Dependency Name="Microsoft.Build.Framework" Version="17.13.26">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>0ca03f84b7848ce9d7d3e5d1f68c5e090efa4f30</Sha>
<Sha>c192adbb5252264481e8c046a8e0694f7fc7855b</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.13.22">
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.13.26">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>0ca03f84b7848ce9d7d3e5d1f68c5e090efa4f30</Sha>
<Sha>c192adbb5252264481e8c046a8e0694f7fc7855b</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.13.22">
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.13.26">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>0ca03f84b7848ce9d7d3e5d1f68c5e090efa4f30</Sha>
<Sha>c192adbb5252264481e8c046a8e0694f7fc7855b</Sha>
</Dependency>
<Dependency Name="System.Reflection.Metadata" Version="8.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<MicrosoftVisualStudioShellPackagesVersion>17.10.40152</MicrosoftVisualStudioShellPackagesVersion>
<VisualStudioProjectSystemPackagesVersion>17.10.526-pre-g1b474069f5</VisualStudioProjectSystemPackagesVersion>
<MicrosoftVisualStudioThreadingPackagesVersion>17.10.41</MicrosoftVisualStudioThreadingPackagesVersion>
<MicrosoftBuildVersion>17.13.22</MicrosoftBuildVersion>
<MicrosoftBuildVersion>17.13.26</MicrosoftBuildVersion>
<!-- Roslyn packages -->
<MicrosoftCodeAnalysisEditorFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
Expand Down Expand Up @@ -138,9 +138,9 @@
<MicrosoftVisualStudioShellImmutable150Version>15.0.25123-Dev15Preview</MicrosoftVisualStudioShellImmutable150Version>
<!-- -->
<!-- Microsoft Build packages -->
<MicrosoftBuildFrameworkVersion>17.13.22</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildTasksCoreVersion>17.13.22</MicrosoftBuildTasksCoreVersion>
<MicrosoftBuildUtilitiesCoreVersion>17.13.22</MicrosoftBuildUtilitiesCoreVersion>
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildTasksCoreVersion>
<MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildUtilitiesCoreVersion>
<!-- -->
<!-- Visual Studio Editor packages -->
<MicrosoftVisualStudioCoreUtilityVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioCoreUtilityVersion>
Expand Down
7 changes: 7 additions & 0 deletions eng/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,13 @@ while [[ $# > 0 ]]; do
tfm=$2
shift
;;
# nop implementations of runtime* args sourcebuild might pass in on internal builds
--runtimesourcefeed)
shift
;;
--runtimesourcefeedkey)
shift
;;
/p:*)
properties="$properties $1"
;;
Expand Down
Loading