[automated] Merge branch 'release/7.0.2xx' => 'release/7.0.3xx' (#15726)

This commit is contained in:
v-wuzhai 2023-03-09 01:26:03 -08:00 committed by GitHub
commit da6c386331
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 9 deletions

View file

@ -193,7 +193,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>7.0.102-4</PrivateSourceBuiltArtifactsPackageVersion> <PrivateSourceBuiltArtifactsPackageVersion>7.0.103</PrivateSourceBuiltArtifactsPackageVersion>
</PropertyGroup> </PropertyGroup>
<!-- Workload manifest package versions --> <!-- Workload manifest package versions -->
<PropertyGroup> <PropertyGroup>

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)')"
/> />

View file

@ -1,6 +1,6 @@
{ {
"tools": { "tools": {
"dotnet": "7.0.102" "dotnet": "7.0.103"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1", "Microsoft.Build.CentralPackageVersions": "2.0.1",

View file

@ -456,7 +456,7 @@ index ------------
+./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll +./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll
./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Drawing.Common.dll ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Drawing.Common.dll
./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll
./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll
./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Windows.Extensions.dll ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Windows.Extensions.dll
./sdk/x.y.z/FSharp/System.CodeDom.dll ./sdk/x.y.z/FSharp/System.CodeDom.dll
./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll ./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll
@ -734,11 +734,6 @@ index ------------
./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.CSharp.resources.dll ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.CSharp.resources.dll
./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.resources.dll ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.resources.dll
./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.VisualBasic.resources.dll ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.VisualBasic.resources.dll
+./sdk/x.y.z/Roslyn/bincore/runtimes/
+./sdk/x.y.z/Roslyn/bincore/runtimes/win/
+./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/
+./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/netx.y/
+./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll
+./sdk/x.y.z/Roslyn/bincore/System.Collections.Immutable.dll +./sdk/x.y.z/Roslyn/bincore/System.Collections.Immutable.dll
+./sdk/x.y.z/Roslyn/bincore/System.Reflection.Metadata.dll +./sdk/x.y.z/Roslyn/bincore/System.Reflection.Metadata.dll
+./sdk/x.y.z/Roslyn/bincore/System.Text.Encoding.CodePages.dll +./sdk/x.y.z/Roslyn/bincore/System.Text.Encoding.CodePages.dll

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>