Skip to content

Commit a2e7374

Browse files
oleksandr-didykoleksandr-didyk
committed
update changes made
1 parent b1e917f commit a2e7374

File tree

6 files changed

+23
-26
lines changed

6 files changed

+23
-26
lines changed

‎NuGet.config

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
66
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
77
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
8-
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
98
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
9+
<!-- Feeds for source-build intermediates -->
10+
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
11+
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
1012
</packageSources>
1113
<disabledPackageSources>
1214
<clear />

‎eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
<!-- Additional documentation on pre-built detection can be found at https://aka.ms/source-build/pre-built -->
1+
<!-- See aka.ms/dotnet/prebuilts for guidance on what pre-builts are and how to eliminate them. -->
22
<UsageData>
33
<IgnorePatterns>
44
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*" />
55
</IgnorePatterns>
6+
<Usages>
7+
<!-- MSBuild versions starting from 16.10.0 do not target NET Core -->
8+
<!-- and fail the non-source-build -->
9+
<Usage Id="Microsoft.Build" Version="16.8.0" IsDirectDependency="true" />
10+
</Usages>
611
</UsageData>

‎eng/Version.Details.xml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,16 @@
1212
<Dependency Name="System.CommandLine.Rendering" Version="0.4.0-alpha.22272.1">
1313
<Uri>https://github.com/dotnet/command-line-api</Uri>
1414
<Sha>209b724a3c843253d3071e8348c353b297b0b8b5</Sha>
15-
<Dependency Name="System.Text.Json" Version="8.0.0-alpha.1.22631.1">
15+
</Dependency>
16+
<Dependency Name="Microsoft.SourceBuild.Intermediate.command-line-api" Version="0.1.327201">
17+
<Uri>https://github.com/dotnet/command-line-api</Uri>
18+
<Sha>209b724a3c843253d3071e8348c353b297b0b8b5</Sha>
19+
</Dependency>
20+
<Dependency Name="System.Text.Json" Version="8.0.0-preview.4.23210.22">
1621
<Uri>https://github.com/dotnet/runtime</Uri>
17-
<Sha>a6f84d42529494b3539684ed993fa554281215b7</Sha>
22+
<Sha>7ebb8886920be7ed2e5f1c8784e4cea516d118d7</Sha>
1823
<SourceBuild RepoName="runtime" ManagedOnly="false" />
1924
</Dependency>
20-
<!-- MSBuild versions starting from 16.10.0 do not target NET Core -->
2125
<Dependency Name="Microsoft.Build" Version="16.8.0">
2226
<Uri>https://github.com/dotnet/msbuild</Uri>
2327
<Sha>a6f6699d1f70bf79db82030938d2c5e52d1e4d2e</Sha>
@@ -26,9 +30,9 @@
2630
<Uri>https://github.com/dotnet/msbuild</Uri>
2731
<Sha>a6f6699d1f70bf79db82030938d2c5e52d1e4d2e</Sha>
2832
</Dependency>
29-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23055.1">
33+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23210.5">
3034
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
31-
<Sha>a7d9aec195d309a8d25022553a43561441a599a8</Sha>
35+
<Sha>f43e7ac7040fa13408a8c2475e5ba76f33402ad2</Sha>
3236
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
3337
</Dependency>
3438
</ProductDependencies>
@@ -38,19 +42,14 @@
3842
<Sha>38d3196e1596eb525367ec8d65fcc1f30a58261c</Sha>
3943
<SourceBuild RepoName="arcade" ManagedOnly="true" />
4044
</Dependency>
41-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23205.5">
42-
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
43-
<Sha>09c4d8e93c5b78897bccb4f27e0c373647fb3985</Sha>
44-
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
45-
</Dependency>
46-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22518-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
45+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-23117-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
4746
<Uri>https://github.com/dotnet/sourcelink</Uri>
48-
<Sha>d047202874ad79d72c75b6354c0f8a9a12d1b054</Sha>
47+
<Sha>955e79b0b955a9f57078b2399a782fcde44a9261</Sha>
4948
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
5049
</Dependency>
51-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22627.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
50+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23116.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
5251
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
53-
<Sha>c9b8a539c59158e189e4a6b9ebcf29b748dcb843</Sha>
52+
<Sha>69157952aba0f08738249af4454b045b553614c4</Sha>
5453
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
5554
</Dependency>
5655
</ToolsetDependencies>

‎eng/Versions.props

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
1010
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
1111
<!-- latest versions auto-updated by Maestro/Darc tooling -->
12-
<MicrosoftSourceLinkGitHubVersion>1.2.0-beta-22518-02</MicrosoftSourceLinkGitHubVersion>
13-
<MicrosoftDotNetXliffTasksVersion>1.0.0-beta.22627.1</MicrosoftDotNetXliffTasksVersion>
14-
<SystemTextJsonVersion>8.0.0-alpha.1.22631.1</SystemTextJsonVersion>
12+
<SystemTextJsonVersion>8.0.0-preview.4.23210.22</SystemTextJsonVersion>
1513
<!-- Pinned versions -->
1614
<MicrosoftBuildVersion>16.8.0</MicrosoftBuildVersion>
1715
<MicrosoftBuildTasksCoreVersion>16.8.0</MicrosoftBuildTasksCoreVersion>

‎src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
<GenerateDocumentationFile>false</GenerateDocumentationFile>
77
<DebugType>none</DebugType>
88
<GenerateDependencyFile>false</GenerateDependencyFile>
9-
<!-- For System.Text.Json 8.x.y reference. Caused and should be removed by https://github.com/dotnet/sourcelink/issues/938-->
10-
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
119

1210
<!-- NuGet -->
1311
<IsPackable>true</IsPackable>

‎src/dotnet-sourcelink/dotnet-sourcelink.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<<<<<<< HEAD
54
<TargetFrameworks>$(NetCurrent)</TargetFrameworks>
6-
=======
7-
<TargetFrameworks>net7.0</TargetFrameworks>
85
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
9-
>>>>>>> add pre-build detection
10-
116
<!-- NuGet -->
127
<IsPackable>true</IsPackable>
138
<PackAsTool>True</PackAsTool>

0 commit comments

Comments
 (0)