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

Merge branch 'release/7.0.3xx'

Browse source
This commit is contained in:
Jason Zhai 2023-03-09 01:32:15 -08:00
commit c08416f7c7
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
View file

@ -78,7 +78,7 @@
Properties="SourcePath=$(RestorePackagesPath);DestinationPath=$(UnpackedTarPath);PackageName=%(PackageDownload.Identity);PackageVersion=%(PackageDownload.Version)" /> Properties="SourcePath=$(RestorePackagesPath);DestinationPath=$(UnpackedTarPath);PackageName=%(PackageDownload.Identity);PackageVersion=%(PackageDownload.Version)" />
<!-- override PVP with bootstrap-override package versions --> <!-- override PVP with bootstrap-override package versions -->
<Message Text=" Overriding previously-source-built package versions with $(BootstrapOverrideVersionsProps)" Importance="High" /> <Message Text=" Overriding previously-source-built package versions with $(BootstrapOverrideVersionsProps)" Importance="High" Condition="Exists('$(BootstrapOverrideVersionsProps)')" />
<ReadLinesFromFile File="$(UnpackedTarPath)/PackageVersions.props"> <ReadLinesFromFile File="$(UnpackedTarPath)/PackageVersions.props">
<Output TaskParameter="Lines" ItemName="OriginalPackageVersionLines" /> <Output TaskParameter="Lines" ItemName="OriginalPackageVersionLines" />
</ReadLinesFromFile> </ReadLinesFromFile>
@ -94,10 +94,12 @@
<WriteLinesToFile File="$(UnpackedTarPath)/PackageVersions.props" <WriteLinesToFile File="$(UnpackedTarPath)/PackageVersions.props"
Lines="@(OriginalPackageVersionLines)" Lines="@(OriginalPackageVersionLines)"
Overwrite="true" Overwrite="true"
Condition="Exists('$(BootstrapOverrideVersionsProps)')"
/> />
<WriteLinesToFile File="$(UnpackedTarPath)/PackageVersions.props" <WriteLinesToFile File="$(UnpackedTarPath)/PackageVersions.props"
Lines="@(BootstrapPackageVersionLines)" Lines="@(BootstrapPackageVersionLines)"
Overwrite="false" Overwrite="false"
Condition="Exists('$(BootstrapOverrideVersionsProps)')"
/> />
<!-- Repack tarball with new bootstrap name --> <!-- Repack tarball with new bootstrap name -->

8
test/SdkTests/TestsToSkipPortableLinux.xml
View file

@ -7,5 +7,13 @@
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAWebApp.It_should_publish_framework_dependent_for_2x" <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAWebApp.It_should_publish_framework_dependent_for_2x"
Skip="true" Skip="true"
Reason="https://github.com/NuGet/Home/issues/8571"/> Reason="https://github.com/NuGet/Home/issues/8571"/>
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAWebApp.PublishWebAppWithPublishProfile"
Skip="true"
Reason="https://github.com/NuGet/Home/issues/8571"/>
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAWebApp.It_should_publish_self_contained_for_2x"
Skip="true"
Reason="https://github.com/NuGet/Home/issues/8571"/>
</SkippedTests> </SkippedTests>
</Tests> </Tests>