-
Notifications
You must be signed in to change notification settings - Fork 198
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #575 from akoeplinger/s390x-master-merge
- Loading branch information
Showing
7,493 changed files
with
399,943 additions
and
57,697 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -196,5 +196,5 @@ indent_size = 2 | |
| # Shell scripts | ||
| [*.sh] | ||
| end_of_line = lf | ||
| [*.{cmd, bat}] | ||
| [*.{cmd,bat}] | ||
| end_of_line = crlf | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,73 @@ | ||
| <Project> | ||
|
|
||
| <Project InitialTargets="ErrorForMissingPackageDescription;_OverridePackDependsOn"> | ||
| <PropertyGroup> | ||
| <!-- | ||
| For non-SDK projects that import this file and then import Microsoft.Common.targets, | ||
| tell Microsoft.Common.targets not to import Directory.Build.targets again | ||
| --> | ||
| <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets> | ||
|
|
||
| <EnableNETAnalyzers Condition="'$(EnableAnalyzers)' != 'true'">false</EnableNETAnalyzers> | ||
| </PropertyGroup> | ||
|
|
||
| <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" /> | ||
| <Import Project="$(RepositoryEngineeringDir)liveBuilds.targets" /> | ||
| <Import Project="$(RepositoryEngineeringDir)python.targets" /> | ||
| <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(SkipImportArcadeSdkFromRoot)' != 'true'" /> | ||
|
|
||
| <PropertyGroup> | ||
| <!-- | ||
| Define this here (not just in Versions.props) because the SDK resets it | ||
| unconditionally in Microsoft.NETCoreSdk.BundledVersions.props. | ||
| --> | ||
| <NETCoreAppMaximumVersion>$(MajorVersion).$(MinorVersion)</NETCoreAppMaximumVersion> | ||
| <EnableNETAnalyzers Condition="'$(EnableAnalyzers)' != 'true'">false</EnableNETAnalyzers> | ||
| <!-- SDK sets product to assembly but we want it to be our product name --> | ||
| <Product>Microsoft%AE .NET</Product> | ||
| <!-- Use the .NET product branding version for informational version description --> | ||
| <InformationalVersion Condition="'$(InformationalVersion)' == '' and '$(VersionSuffix)' == ''">$(ProductVersion)</InformationalVersion> | ||
| <InformationalVersion Condition="'$(InformationalVersion)' == '' and '$(VersionSuffix)' != ''">$(ProductVersion)-$(VersionSuffix)</InformationalVersion> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- The Default behavior in VS is to show files for the first target framework in TargetFrameworks property. | ||
| This is required to show all the files corresponding to all target frameworks in VS. --> | ||
| <ItemGroup Condition="'$(DefaultLanguageSourceExtension)' != '' and | ||
| ('$(BuildingInsideVisualStudio)' == 'true' or '$(DesignTimeBuild)' == 'true')"> | ||
| <None Include="$(MSBuildProjectDirectory)\**\*$(DefaultLanguageSourceExtension)" | ||
| Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);@(Compile)" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- | ||
| SDK currently does not know about net6.0 TargetFramework. | ||
| We need to manually add these to correctly resolve the targeting packs. | ||
| https://github.com/dotnet/sdk/issues/13950 | ||
| --> | ||
| <ItemGroup> | ||
| <KnownFrameworkReference Include="Microsoft.NETCore.App" | ||
| DefaultRuntimeFrameworkVersion="$(MicrosoftNETCoreAppVersion)" | ||
| IsTrimmable="true" | ||
| LatestRuntimeFrameworkVersion="$(MicrosoftNETCoreAppVersion)" | ||
| RuntimeFrameworkName="Microsoft.NETCore.App" | ||
| RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**" | ||
| RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;ios-arm64;ios-arm;ios-x64;ios-x86;tvos-arm64;tvos-x64;android-arm64;android-arm;android-x64;android-x86;browser-wasm" | ||
| TargetFramework="$(NetCoreAppCurrent)" | ||
| TargetingPackName="Microsoft.NETCore.App.Ref" | ||
| TargetingPackVersion="$(MicrosoftNETCoreAppVersion)" /> | ||
|
|
||
| <KnownAppHostPack Include="Microsoft.NETCore.App" | ||
| AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**" | ||
| AppHostPackVersion="$(MicrosoftNETCoreAppVersion)" | ||
| AppHostRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86" | ||
| TargetFramework="$(NetCoreAppCurrent)" /> | ||
| <!-- Packaging --> | ||
| <ItemGroup Condition="'$(IsPackable)' == 'true'"> | ||
| <!-- The sfxproj files add the license themselves. --> | ||
| <None Include="$(LicenseFile)" | ||
| PackagePath="$([System.IO.Path]::GetFileName('$(LicenseFile)'))" | ||
| Pack="true" | ||
| Condition="'$(MSBuildProjectExtension)' != '.sfxproj'" /> | ||
| <None Include="$(PackageThirdPartyNoticesFile)" | ||
| PackagePath="$([System.IO.Path]::GetFileName('$(PackageThirdPartyNoticesFile)'))" | ||
| Pack="true" /> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <PackageDescription Condition="'$(PackageDescription)' == '' and '$(Description)' != ''">$(Description)</PackageDescription> | ||
| <RuntimePackageDisclaimer>Internal implementation package not meant for direct consumption. Please do not reference directly.</RuntimePackageDisclaimer> | ||
| <UseRuntimePackageDisclaimer Condition="'$(UseRuntimePackageDisclaimer)' == '' and | ||
| ($(MSBuildProjectName.StartsWith('runtime.native')) or '$(PackageTargetRuntime)' != '')">true</UseRuntimePackageDisclaimer> | ||
| <PackageDescription Condition="'$(PackageDescription)' != '' and '$(UseRuntimePackageDisclaimer)' == 'true'">$(RuntimePackageDisclaimer) %0A$(PackageDescription)</PackageDescription> | ||
| <PackageDescription Condition="'$(PackageDescription)' == '' and '$(UseRuntimePackageDisclaimer)' == 'true'">$(RuntimePackageDisclaimer)</PackageDescription> | ||
| <!-- Keep in sync as required by the Packaging SDK in Arcade. --> | ||
| <Description>$(PackageDescription)</Description> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- Remove when https://github.com/NuGet/Home/issues/10405 is implemented and consumed. --> | ||
| <Target Name="ErrorForMissingPackageDescription" | ||
| Condition="'$(IsPackable)' == 'true' and '$(PackageDescription)' == ''"> | ||
| <Error Text="Required property 'PackageDescription' is missing for $(MSBuildProjectName)." /> | ||
| </Target> | ||
|
|
||
| <!-- <GeneratePackage /> controls if a package should be created by clearing out <PackDependsOn />. --> | ||
| <Target Name="_OverridePackDependsOn" | ||
| Condition="'$(IsPackable)' == 'true' and | ||
| '$(GeneratePackage)' != 'true'"> | ||
| <PropertyGroup> | ||
| <PackDependsOn /> | ||
| </PropertyGroup> | ||
| </Target> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.