Skip to content

add source-build pre-built detection #933

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

Merged
tmat merged 11 commits into from
May 16, 2023
Merged

add source-build pre-built detection #933

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8ce220b
add pre-build detection
oleksandr-didyk Jan 2, 2023
bcc159d
downgrade MSBuild to 16.8
oleksandr-didyk Jan 3, 2023
583813e
add clarifying comments; move source-build RID prop in CI
oleksandr-didyk Jan 10, 2023
8218b06
fixup sbrp definition; fixup invalid msbuild version prop
oleksandr-didyk Jan 11, 2023
db472d5
update changes made
oleksandr-didyk Apr 11, 2023
05bc0df
remove redundant CI arg
oleksandr-didyk Apr 11, 2023
89694bc
add missing sb attribute; bump arcade dep versions
oleksandr-didyk Apr 13, 2023
b8fef1f
remove obsolete pre-built exclusions; fixup dep versions
oleksandr-didyk May 4, 2023
81716f5
remove obsolete nuget source; fixup sourcebuild metadata
oleksandr-didyk May 4, 2023
c6ba833
fixup duplicate dependency declaration
oleksandr-didyk May 15, 2023
0b09480
add explanation for dotnet-sourcelink exclusion
oleksandr-didyk May 16, 2023
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
Prev Previous commit
Next Next commit
remove obsolete pre-built exclusions; fixup dep versions
  • Loading branch information
@oleksandr-didyk
oleksandr-didyk committed May 15, 2023
commit b8fef1f5f378c11aa75bf6cddef961958b3e8741
2 changes: 1 addition & 1 deletion NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
<!-- Feeds for source-build intermediates -->
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<clear />
Expand Down
5 changes: 0 additions & 5 deletions eng/SourceBuildPrebuiltBaseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,4 @@
<IgnorePatterns>
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*" />
</IgnorePatterns>
<Usages>
<!-- MSBuild versions starting from 16.10.0 do not target NET Core -->
<!-- and fail the non-source-build -->
<Usage Id="Microsoft.Build" Version="16.8.0" IsDirectDependency="true" />
</Usages>
</UsageData>
21 changes: 4 additions & 17 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="System.CommandLine" Version="0.1.327201">
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.22272.1">
<Uri>https://github.com/dotnet/command-line-api</Uri>
<Sha>209b724a3c843253d3071e8348c353b297b0b8b5</Sha>
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
Expand All @@ -18,20 +18,7 @@
<Uri>https://github.com/dotnet/command-line-api</Uri>
<Sha>209b724a3c843253d3071e8348c353b297b0b8b5</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="8.0.0-preview.4.23210.22">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>7ebb8886920be7ed2e5f1c8784e4cea516d118d7</Sha>
<SourceBuild RepoName="runtime" ManagedOnly="false" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="16.8.0">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>a6f6699d1f70bf79db82030938d2c5e52d1e4d2e</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Tasks.Core" Version="16.8.0">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>a6f6699d1f70bf79db82030938d2c5e52d1e4d2e</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23211.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23253.2">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>c053ca210364dfa4904006b811249f14743e853e</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
Expand All @@ -48,12 +35,12 @@
<Sha>d76c30028584fb1d02d9b27dc48e65ad87f4ecfe</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23210.3" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23218.3" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>759f344923a0859f3fae83431d0ba1cc62108118</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23206.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23218.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>519d565b45c46ac452fe5a77ab63295138992e07</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
Expand Down
2 changes: 1 addition & 1 deletion eng/cibuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ while [[ -h $source ]]; do
done
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"

. "$scriptroot/common/build.sh" --restore --build --test --pack --integrationTest --publish --ci "$@"
. "$scriptroot/common/build.sh" --restore --build --test --pack --integrationTest --publish --ci $@