Skip to content

Update source-build artifacts to be coherent #15372

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
merged 12 commits into from
Feb 7, 2023
Merged

Update source-build artifacts to be coherent #15372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9545778
Update source-build artifacts to be coherant
MichaelSimons Jan 30, 2023
3d3fd4b
Disable CheckEolTargetFramework for all projects (#15222)
mthalman Jan 11, 2023
70acba8
Merge branch 'main' into update-sb-artifacts
MichaelSimons Jan 31, 2023
7d4a815
Suppress runtime build warning
MichaelSimons Jan 31, 2023
d278676
Merge branch 'main' of https://github.com/dotnet/installer into updat…
MichaelSimons Jan 31, 2023
6c07e45
Revert "Suppress runtime build warning"
MichaelSimons Jan 31, 2023
a5fbfad
Merge branch 'main' into update-sb-artifacts
mthalman Feb 1, 2023
9610667
Merge branch 'main' of https://github.com/dotnet/installer into updat…
MichaelSimons Feb 2, 2023
ce2b091
Merge branch 'update-sb-artifacts' of https://github.com/MichaelSimon…
MichaelSimons Feb 2, 2023
3df958c
Disable cleanup
MichaelSimons Feb 7, 2023
dcc3666
Merge branch 'main' of https://github.com/dotnet/installer into updat…
MichaelSimons Feb 7, 2023
ecd6dec
Refactor how clean-while-building is disabled
MichaelSimons Feb 7, 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
3 changes: 2 additions & 1 deletion src/SourceBuild/content/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ while :; do
lowerI="$(echo $1 | awk '{print tolower($0)}')"
case $lowerI in
--clean-while-building)
MSBUILD_ARGUMENTS+=( "-p:CleanWhileBuilding=true")
# TODO: Reenable with https://github.com/dotnet/source-build/issues/3233
# MSBUILD_ARGUMENTS+=( "-p:CleanWhileBuilding=true")
;;
--online)
MSBUILD_ARGUMENTS+=( "-p:BuildWithOnlineSources=true")
Expand Down
3 changes: 2 additions & 1 deletion src/SourceBuild/content/eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
or minor release, prebuilts may be needed. When the release is mature, prebuilts are not
necessary, and this property is removed from the file.
-->
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-8.0.100-4.centos.8-x64</PrivateSourceBuiltArtifactsPackageVersion>
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-8.0.100-5.centos.8-x64</PrivateSourceBuiltArtifactsPackageVersion>
<PrivateSourceBuiltPrebuiltsPackageVersion>0.1.0-8.0.100-1.centos.8-x64</PrivateSourceBuiltPrebuiltsPackageVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src/SourceBuild/content/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "8.0.100-alpha.1.23061.8"
"dotnet": "8.0.100-alpha.1.23080.2"
},
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1",
Expand Down
3 changes: 3 additions & 0 deletions src/SourceBuild/content/repo-projects/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@
<EnvironmentVariables Include="DeterministicSourcePaths=false" Condition="'$(DeterministicBuildOptOut)' == 'true'" />

<EnvironmentVariables Include="SourceRoot=$(ProjectDirectory)" />

<!-- https://github.com/dotnet/source-build/issues/3081 -->
<EnvironmentVariables Include="CheckEolTargetFramework=false" />
</ItemGroup>

<ItemGroup Condition="'$(EnableExtraDebugging)' == 'true'">
Expand Down
2 changes: 1 addition & 1 deletion src/SourceBuild/content/repo-projects/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@
AfterTargets="RemoveBuiltPackagesFromCache"
Condition=" '$(CleanWhileBuilding)' == 'true' ">

<!-- Make a copy of the build logs & project.assets.json files-->
<!-- Make a copy of the build logs & project.assets.json files -->
<PropertyGroup>
<BuildLogsDir>$(ProjectDirectory)artifacts/buildLogs</BuildLogsDir>
<BuildObjDir>$(ProjectDirectory)artifacts/buildObj</BuildObjDir>
Expand Down
1 change: 0 additions & 1 deletion src/SourceBuild/content/repo-projects/fsharp.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

<ItemGroup>
<UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" />
<EnvironmentVariables Include="CheckEolTargetFramework=false" />
</ItemGroup>

<Target Name="SetArcadeSdkDir"
Expand Down
2 changes: 0 additions & 2 deletions src/SourceBuild/content/repo-projects/xliff-tasks.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

<PropertyGroup>
<BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
<!-- Repo has netcoreapp2.1 projects: https://github.com/dotnet/xliff-tasks/issues/508 -->
<BuildCommandArgs>$(BuildCommandArgs) /p:CheckEolTargetFramework=false</BuildCommandArgs>
<BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>

<RepoApiImplemented>false</RepoApiImplemented>
Expand Down