mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update source-build artifacts to be coherent (#15372)

Browse source 
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
This commit is contained in:
Michael Simons 2023-02-07 11:07:22 -06:00 • committed by GitHub
parent 918b40ce86
commit 593bfe8532
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/SourceBuild/content/build.sh
View file

@ -37,7 +37,8 @@ while :; do
lowerI="$(echo $1 | awk '{print tolower($0)}')" lowerI="$(echo $1 | awk '{print tolower($0)}')"
case $lowerI in case $lowerI in
--clean-while-building) --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) --online)
MSBUILD_ARGUMENTS+=( "-p:BuildWithOnlineSources=true") MSBUILD_ARGUMENTS+=( "-p:BuildWithOnlineSources=true")

3
src/SourceBuild/content/eng/Versions.props
View file

@ -24,6 +24,7 @@
or minor release, prebuilts may be needed. When the release is mature, prebuilts are not or minor release, prebuilts may be needed. When the release is mature, prebuilts are not
necessary, and this property is removed from the file. 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> </PropertyGroup>
</Project> </Project>

2
src/SourceBuild/content/global.json
View file

@ -1,6 +1,6 @@
{ {
"tools": { "tools": {
"dotnet": "8.0.100-alpha.1.23061.8" "dotnet": "8.0.100-alpha.1.23080.2"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1", "Microsoft.Build.CentralPackageVersions": "2.0.1",

3
src/SourceBuild/content/repo-projects/Directory.Build.props
View file

@ -106,6 +106,9 @@
<EnvironmentVariables Include="DeterministicSourcePaths=false" Condition="'$(DeterministicBuildOptOut)' == 'true'" /> <EnvironmentVariables Include="DeterministicSourcePaths=false" Condition="'$(DeterministicBuildOptOut)' == 'true'" />
<EnvironmentVariables Include="SourceRoot=$(ProjectDirectory)" /> <EnvironmentVariables Include="SourceRoot=$(ProjectDirectory)" />
<!-- https://github.com/dotnet/source-build/issues/3081 -->
<EnvironmentVariables Include="CheckEolTargetFramework=false" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(EnableExtraDebugging)' == 'true'"> <ItemGroup Condition="'$(EnableExtraDebugging)' == 'true'">

1
src/SourceBuild/content/repo-projects/fsharp.proj
View file

@ -27,7 +27,6 @@
<ItemGroup> <ItemGroup>
<UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" /> <UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" />
<EnvironmentVariables Include="CheckEolTargetFramework=false" />
</ItemGroup> </ItemGroup>
<Target Name="SetArcadeSdkDir" <Target Name="SetArcadeSdkDir"

2
src/SourceBuild/content/repo-projects/xliff-tasks.proj
View file

@ -3,8 +3,6 @@
<PropertyGroup> <PropertyGroup>
<BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs> <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> <BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
<RepoApiImplemented>false</RepoApiImplemented> <RepoApiImplemented>false</RepoApiImplemented>