dotnet-installer/build
Piotr Puszkiewicz a07ebe2e7b Merge remote-tracking branch 'refs/remotes/dotnet/master'
Conflicts:
	TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
	TestAssets/NonRestoredTestProjects/AppThrowingException/App/AppThrowingException.csproj
	TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/AppDependingOnOtherAsTool.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj
	TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj
	TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj
	TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
	TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
	TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj
	TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj
	TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj
	TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
	TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
	TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj
	TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj
	TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj
	TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj
	build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj
	build_projects/dotnet-cli-build/dotnet-cli-build.csproj
	build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateConfigurations.cs
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs
2017-03-02 23:49:01 -08:00
..
compile Fixing a couple of wrong merges. 2017-03-01 22:34:08 -08:00
package Moving as many of our test assets to netcoreapp2.0 as possible. I believe the only ones missing at the test packages, because tools always target 1.0. And the other ones are VSTestDotNetCore and VSTestXUnitDotNetCore, because we can't run tests on 2.0 yet. Or, when I tried it failed. I may came back to try this out later. 2017-03-02 17:41:21 -08:00
prepare Don't look for Debian package dependencies when skipping installers 2017-02-23 14:11:11 -08:00
publish Remove OpenSUSE13 and Fedora23 since they are end of lifed. 2017-03-01 15:27:50 -06:00
sdks Version as Metadata in build/ 2017-03-02 19:50:46 -08:00
templates Version as Metadata in build/ 2017-03-02 19:50:46 -08:00
test Remove RID from package creation 2017-02-28 12:00:05 -08:00
AzureInfo.props Refactor publish.target 2017-02-22 16:54:15 -08:00
BranchInfo.props Add back last empty line in BranchInfo.props 2017-02-24 10:36:07 -08:00
Branding.props Remove OpenSUSE13 and Fedora23 since they are end of lifed. 2017-03-01 15:27:50 -06:00
BuildDefaults.props Merge branch 'master' into dev/jgoshi/renamePropsFiles 2017-02-15 17:02:42 -08:00
BundledRuntimes.props First pass at cleaning up the global properties files 2017-02-23 17:07:26 -08:00
BundledSdks.proj Rename build files 2017-02-14 15:42:13 -08:00
BundledSdks.props Rename build files 2017-02-14 15:42:13 -08:00
BundledTemplates.proj Rename build files 2017-02-14 15:42:13 -08:00
BundledTemplates.props Rename build files 2017-02-14 15:42:13 -08:00
BundledTools.props Move tool deps file creation into redist.csproj 2017-02-22 22:47:11 -08:00
Compile.targets Move remaining Publish actions to redist.csproj 2017-03-01 00:45:02 -08:00
CrossGen.props Initial 2017-02-28 01:17:22 -08:00
DependencyVersions.props Updating the version of the TestFramework which fixed the tests for dotnet test and vstest and actually managed to move the projects used there to 2.0. So, only test packages should remain 1.0. 2017-03-02 21:43:06 -08:00
FileExtensions.props merge 2017-02-14 16:43:23 -08:00
GitCommitInfo.targets Remove task usage in commitcount calculation 2017-03-02 18:46:08 -08:00
HostInfo.targets Rename build files 2017-02-14 15:42:13 -08:00
InitRepo.props Rename build files 2017-02-14 15:42:13 -08:00
InitRepo.targets Rename build files 2017-02-14 15:42:13 -08:00
InputDirectories.props First pass at cleaning up the global properties files 2017-02-23 17:07:26 -08:00
InstallerInfo.props Fix broken publish for official builds 2017-02-28 10:16:52 -08:00
Microsoft.DotNet.Cli.tasks Remove task usage in commitcount calculation 2017-03-02 18:46:08 -08:00
MSBuildExtensions.props Merge conflicts 2017-02-27 17:13:13 -08:00
OutputDirectories.props Remove duplicate properties 2017-02-27 11:06:44 -08:00
Package.targets Merge branch 'master' into dev/jgoshi/renamePropsFiles 2017-02-15 17:02:42 -08:00
Prepare.targets Move remaining Publish actions to redist.csproj 2017-03-01 00:45:02 -08:00
ProjectsToPublish.props ProjectsToPublish 2017-02-22 15:33:55 -08:00
Publish.targets Address pr comments 2017-02-23 09:26:14 -08:00
Run.targets Rename build files 2017-02-14 15:42:13 -08:00
Signing.proj Remove duplicate properties 2017-02-27 11:06:44 -08:00
Stage0.props First pass at cleaning up the global properties files 2017-02-23 17:07:26 -08:00
Test.targets Add back Windows condition 2017-02-28 19:30:43 -08:00
Version.props fix merge 2017-02-17 13:07:14 -08:00
VersionBadge.props Remove OpenSUSE13 and Fedora23 since they are end of lifed. 2017-03-01 15:27:50 -06:00