34c7829222
# Conflicts: # eng/Version.Details.xml # eng/Versions.props # global.json # src/redist/redist.csproj # src/redist/targets/BundledDotnetTools.targets # src/redist/targets/BundledTemplates.targets # src/redist/targets/Crossgen.targets # src/redist/targets/GenerateArchives.targets # src/redist/targets/GenerateLayout.targets # src/redist/targets/GeneratePKG.targets # test/SdkTests/SdkTests.csproj |
||
---|---|---|
.. | ||
SdkTests.csproj | ||
TestConfig.xml | ||
TestsToSkipLinux.xml | ||
TestsToSkipOSX.xml | ||
TestsToSkipPortableLinux.xml | ||
TestsToSkipStableSDK.xml | ||
TestsToSkipx86.xml |