Piotr Puszkiewicz
84ead82037
RootProject property
2017-02-22 16:57:10 -08:00
Unknown
1c9f2e9b83
ProjectsToPublish
2017-02-22 15:33:55 -08:00
Piotr Puszkiewicz
5be3a70121
RootProject property
2017-02-22 15:31:55 -08:00
Justin Goshi
13dbdd1a4e
Merge
2017-02-22 13:38:39 -08:00
Piotr Puszkiewicz
a0a7512d7b
Merge pull request #5782 from dotnet/dev/jgoshi/refactorCrossgenTarget
...
Refactor props in crossgen.target
2017-02-22 13:19:27 -08:00
Justin Goshi
4442b45fef
Try to fix spacing part 3
2017-02-22 11:08:16 -08:00
Justin Goshi
c51d129294
Try to fix spacing part 2
2017-02-22 11:06:57 -08:00
Justin Goshi
aff69fb324
Try to fix spacing
2017-02-22 11:03:11 -08:00
Justin Goshi
7b62dd1267
Address some of the PR comments
2017-02-22 10:52:50 -08:00
Justin Goshi
1d9a2e5da1
Merge branch 'master' into dev/jgoshi/refactorLzmaTarget
2017-02-22 10:21:22 -08:00
Justin Goshi
02e47f1d00
Address PR comments
2017-02-22 10:10:54 -08:00
Justin Goshi
70b6dc3be6
Merge branch 'master' into dev/jgoshi/refactorCrossgenTarget
2017-02-22 10:08:54 -08:00
Justin Goshi
d828a08e60
Address PR comments
2017-02-22 09:25:06 -08:00
Justin Goshi
f7d77e3e54
Merge branch 'master' into dev/jgoshi/refactorTestTarget
2017-02-22 09:17:54 -08:00
Piotr Puszkiewicz
c5e7c3dd45
Merge pull request #5736 from dotnet/dev/jgoshi/morePropsRename
...
Finish renaming props file to remove Microsoft.Dotnet.Cli prefix
2017-02-22 09:15:20 -08:00
Piotr Puszkiewicz
a1e9a5dfc4
PR feedback
2017-02-21 22:17:28 -08:00
Piotr Puszkiewicz
70b0a68038
Fix Stage2SdkDirectory
2017-02-21 22:17:28 -08:00
Piotr Puszkiewicz
a7fdc20f25
Convert redist.csproj outputdir to static property
...
Also some cleanup to unnecessary stuff.
2017-02-21 22:17:28 -08:00
Justin Goshi
d6dccfe75b
Fix build breaks
2017-02-21 15:57:16 -08:00
Justin Goshi
2eb2c00b30
Refactor props in crossgen.target
2017-02-21 14:22:36 -08:00
Justin Goshi
b58a0210e2
Refactor properties from LzmaCompile.targets
2017-02-21 12:52:17 -08:00
Justin Goshi
f8148abec3
merge
2017-02-21 10:16:07 -08:00
Justin Goshi
27a11e4eca
Merge branch 'master' into dev/jgoshi/morePropsRename
2017-02-21 10:00:30 -08:00
Livar Cunha
3ff78c64ff
Fixing the build breaks by removing duplicate RemoteAssetsFromDepsJson and by fixing VersionSuffix in some needed test packages, because now they import dirs.props and dirs.props eventually brings in VersionSuffix.
2017-02-18 22:03:36 -08:00
Piotr Puszkiewicz
0f919d7442
fix merge
2017-02-17 13:07:14 -08:00
Justin Goshi
4f209e61ea
Refactor properties out of test.targets
2017-02-17 12:28:25 -08:00
Justin Goshi
30a43b3bda
Merge
2017-02-17 09:53:00 -08:00
Piotr Puszkiewicz
85b2a129db
Merge branch 'rel/1.0.0'
...
Conflicts:
TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj
TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj
build.proj
build/Compile.targets
build/Microsoft.DotNet.Cli.Compile.targets
build/Microsoft.DotNet.Cli.DependencyVersions.props
build/Microsoft.DotNet.Cli.Monikers.props
build/Microsoft.DotNet.Cli.Prepare.targets
build/package/Microsoft.DotNet.Cli.Nupkg.targets
build/package/Nupkg.targets
build/test/TestPackageProjects.targets
build_projects/dotnet-cli-build/GenerateBuildVersionInfo.cs
build_projects/dotnet-cli-build/GetCommitCount.cs
build_projects/dotnet-cli-build/dotnet-cli-build.csproj
build_projects/shared-build-targets-utils/Utils/BuildVersion.cs
src/dotnet-archive/dotnet-archive.csproj
src/tool_msbuild/tool_msbuild.csproj
src/tool_nuget/tool_nuget.csproj
test/ArgumentForwardingTests/ArgumentForwardingTests.csproj
test/ArgumentsReflector/ArgumentsReflector.csproj
test/EndToEnd/EndToEnd.csproj
test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj
test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj
test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj
test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj
test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
test/binding-redirects.Tests/binding-redirects.Tests.csproj
test/crossgen.Tests/crossgen.Tests.csproj
test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj
test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj
test/dotnet-build.Tests/dotnet-build.Tests.csproj
test/dotnet-help.Tests/dotnet-help.Tests.csproj
test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj
test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj
test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj
test/dotnet-new.Tests/dotnet-new.Tests.csproj
test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj
test/dotnet-pack.Tests/dotnet-pack.Tests.csproj
test/dotnet-publish.Tests/dotnet-publish.Tests.csproj
test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj
test/dotnet-restore.Tests/dotnet-restore.Tests.csproj
test/dotnet-run.Tests/dotnet-run.Tests.csproj
test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj
test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj
test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj
test/dotnet-test.Tests/dotnet-test.Tests.csproj
test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj
test/dotnet.Tests/dotnet.Tests.csproj
test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj
tools/Archiver/Archiver.csproj
2017-02-17 02:00:05 -08:00
Justin Goshi
23a3879f46
Fix build break
2017-02-16 16:42:49 -08:00
Justin Goshi
5359ce47e9
Rename
2017-02-16 15:10:18 -08:00
Justin Goshi
e232e7d386
Revert the new file name
2017-02-16 15:09:42 -08:00
Justin Goshi
8acaadb625
Revert the rename
2017-02-16 15:09:08 -08:00
Justin Goshi
58d167f3e5
Refactor properties out of Compile.targets
2017-02-16 12:21:15 -08:00
Justin Goshi
8e58a247b0
Finish renaming props file to remove Microsoft.Dotnet.Cli prefix
2017-02-16 11:16:20 -08:00
Justin Goshi
c8fb586677
merge
2017-02-16 08:58:40 -08:00
Piotr Puszkiewicz
0e5633e527
Remove BundledRuntimes properties
2017-02-15 19:37:51 -08:00
Justin Goshi
e7de32e988
Merge branch 'master' into dev/jgoshi/renamePropsFiles
2017-02-15 17:02:42 -08:00
Matt Ellis
47b75cfa12
Misc build changes
...
For injestion into a composed build, I'm adding some minor tweaks to
our build system:
- Teach DownloadFile task how to consume file:// URLs so we can pass
around artifacts using local sources.
- Add `SkipBuildingInstallers`, an MSBuild property that can be set
to true when installers (pkgs, msis, debs, rpms and the like) do
not need to be built.
- Add `IncludeAdditionalSharedFrameworks`, an MSBuild property that
can be set to prevent additional shared frameworks (i.e. shared
frameworks that the CLI does not use at runtime) from being
downloaded and included in our payload.
- Add `IncludeNuGetPackageArchive` an MSBuild property that can be
set to prevent the lzma archive containing all the nupkgs we
restore on first run from being included in the final output.
- Provide a way to change the Uri use for blob storage (so the
composed build and point at a local folder that looks like blob
storage to pick up artifacts from).
2017-02-15 16:52:46 -08:00
Justin Goshi
2664015e55
Merge branch 'master' into dev/jgoshi/renamePropsFiles
2017-02-15 16:01:37 -08:00
Livar
a1f4e81aec
Merge branch 'rel/1.0.0' into piotrpMSFT/bump/15.1.548
2017-02-15 13:03:27 -08:00
Steve Desmond
bcad939b91
don't try to make crossgen executable if crossgen is disabled (it might not exist!)
2017-02-15 15:39:55 -05:00
Justin Goshi
4d38a9be97
Fix the file
2017-02-15 12:00:57 -08:00
Justin Goshi
74493a13e9
Delete the renamed file
2017-02-15 11:59:51 -08:00
Justin Goshi
b40635f8df
Fix up the file
2017-02-15 11:59:30 -08:00
Justin Goshi
2f298ed616
Now add the original file without any rename
2017-02-15 11:57:11 -08:00
Justin Goshi
da81fcaa30
One more try. Delete the file first
2017-02-15 11:56:46 -08:00
Justin Goshi
832e8dc6e0
try new spacing
2017-02-15 11:54:35 -08:00
Livar Cunha
6c07b929bd
The variable was missing dollar sign parenthesis in the target file.
2017-02-15 11:53:31 -08:00
Justin Goshi
0c7a94e7cb
Trying to figure out spacing
2017-02-15 11:52:14 -08:00
Justin Goshi
ce0ae2553d
fix tabs
2017-02-15 11:51:00 -08:00