mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5350 commits 41 branches 190 tags 95 MiB
Commit graph

507 commits

Author SHA1 Message Date
Eric Erhardt
0e0b59f910 Merge pull request #5909 from dotnet/UpdateSDK 
Update NET.Sdk to 1.1.0-alpha-20170303-2
 2017-03-03 19:56:16 -06:00
Rama Krishnan Raghupathy
94dab4559a Merge remote-tracking branch 'upstream/master' into UpdateSDK 2017-03-03 14:27:05 -08:00
Livar
70c65160f6 Merge pull request #5892 from livarcocc/merge_rel101_into_master 
Merge rel101 into master
 2017-03-03 14:11:06 -08:00
Parallels
a5c7ac12f7 Fixing a couple more merge issues regarding deb generation. 2017-03-03 13:30:57 -08:00
Daniel Plaisted
4b9c4efc3f Update versions of MSBuild and NuGet 2017-03-03 12:33:56 -08:00
Parallels
f42599dec2 Fixing ubuntu deb generation. 2017-03-03 11:13:41 -08:00
Eric Erhardt
7fca740af5 Update NET.Sdk to 1.1.0-alpha-20170303-2 2017-03-03 10:11:30 -06:00
Livar Cunha
c667ec7702 Fixing a bad merge on Installer.DEB.proj. 2017-03-03 01:08:58 -08:00
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
Piotr Puszkiewicz
5048f65703 Merged branch master into piotrpMSFT/infra/CodeCleanup 2017-03-02 21:56:50 -08:00
Livar Cunha
103833fd34 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
Piotr Puszkiewicz
a5862752c9 Version as Metadata in build/ 2017-03-02 19:50:46 -08:00
Piotr Puszkiewicz
fbb75e1a47 Remove task usage in commitcount calculation 2017-03-02 18:46:08 -08:00
Livar Cunha
23e39c10b7 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
Livar Cunha
792cc7bf2a Fixing a couple of wrong merges. 2017-03-01 22:34:08 -08:00
Livar Cunha
3a9525b5ac Merge branch 'rel/1.0.1' into merge_rel101_into_master 
* rel/1.0.1: (66 commits)
  Update LZMA license with correct text
  Bump to 2.0.0-rc5-61427-04
  Remove duplicate installer suffix
  Add license text to LZMA SDK license notice
  Updating the SDK to 1.0.0-alpha-20170224-6
  Updating both platform abstractions and dependency model to 1.0.3.
  Bump Roslyn to 2.0.0-rc5-61424-02
  Update Stage0 to use the latest build.
  Update README with new distros.
  Back porting #5597 into rel/1.0.0
  Fixing the exclude pattern used by the Migration to exclude WEB SDK globs.
  Remove RID from test package creation
  Disable migrate and publish web app with content because CI does not have NPM
  Adding an E2E test for pack with content during migration.
  Fixing a failing test and adding a few more E2E tests around binplace content for migrated projects.
  Fix debian_config.json on ubuntu16.10
  Updating publish, pack and build of content to use None with Never/false/Never in their metadata for excluded items.
  Intermediate commit to get a WIP PR out. This adds the None Update with CopyToOutputDirectory set to Never.
  Switching the CopyToOutput for build and publish and the file for pack to use None Update instead of include. Also, fixed the exclude patterns for web apps.
  Do not migrate Content that is already included in the Web SDK for web apps.
  ...
 2017-03-01 20:50:42 -08:00
Eric Erhardt
b64068291b Remove OpenSUSE13 and Fedora23 since they are end of lifed. 2017-03-01 15:27:50 -06:00
Livar Cunha
94b79f4466 Updating the badge names that we use when checking if the build changed. Before, we were using an API to generate the OS names, now we are using msbuild OSName property, which names the OS differently. 2017-03-01 11:46:53 -08:00
Piotr Puszkiewicz
12fde69e86 Move remaining Publish actions to redist.csproj 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
eee7c7ed32 Move PDB removal to redist.csproj target 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
283a80dff0 Move Symbols package creation to redist target 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
28d83da782 Remove vbc in a target 2017-03-01 00:45:02 -08:00
Piotr Puszkiewicz
db35770913 Add back Windows condition 2017-02-28 19:30:43 -08:00
Piotr Puszkiewicz
664f089985 Reduce chmod 2017-02-28 18:16:51 -08:00
Piotr Puszkiewicz
b2429da437 Merge pull request #5869 from dotnet/dev/jgoshi/fixBrokenPublish 
Fix broken publish for official builds
 2017-02-28 14:34:32 -08:00
Piotr Puszkiewicz
52af661ca2 Merge pull request #5866 from piotrpMSFT/piotrpMSFT/infra/crossgentarget 
Simplify crossgen script and move to dedicated target in redist.csproj
 2017-02-28 14:33:58 -08:00
Piotr Puszkiewicz
88ab21600d Remove RID from package creation 2017-02-28 12:00:05 -08:00
Justin Goshi
9ffa76eab4 Fix broken publish for official builds 2017-02-28 10:16:52 -08:00
Piotr Puszkiewicz
01ca1b1208 Ensure redist publishes Roslyn 
Also fix issue found in PR
 2017-02-28 01:39:45 -08:00
Piotr Puszkiewicz
9bdd38cc19 Initial 2017-02-28 01:17:22 -08:00
Eric Erhardt
37c6842e00 Update NET.Sdk to 1.1.0-alpha-20170228-1. 2017-02-27 23:24:02 -08:00
Eric Erhardt
c1da263d40 Update NuGet to 4.0.1-beta-2321. 
Update NET.Sdk to 1.1.0-alpha-20170227-1
 2017-02-27 23:23:37 -08:00
Eric Erhardt
93f8157a04 Update NET.Sdk to 1.1.0-alpha-20170217-4 2017-02-27 23:21:16 -08:00
Piotr Puszkiewicz
15f1582945 Move Test to use build output where possible. 2017-02-27 20:45:26 -08:00
Piotr Puszkiewicz
8ca21b67f9 Add relative paths, add logs by default 2017-02-27 17:19:39 -08:00
Piotr Puszkiewicz
5d193e8b39 Merge conflicts 2017-02-27 17:13:13 -08:00
Piotr Puszkiewicz
b1787426c0 Also move nupkg contentFiles 2017-02-27 17:11:37 -08:00
Piotr Puszkiewicz
43266d2d9a Move publishing static MSBuildExtensions to redist.csproj 2017-02-27 17:11:03 -08:00
Piotr Puszkiewicz
7ea5bf478e Merge pull request #5861 from dotnet/dev/jgoshi/removeDuplicateProps 
Remove duplicate properties
 2017-02-27 16:40:31 -08:00
Piotr Puszkiewicz
e92f9dfe0d Bump to 2.0.0-rc5-61427-04 2017-02-27 15:07:54 -08:00
Piotr Puszkiewicz
79704cc074 Merge branch 'rel/1.0.1' into piotrpMSFT/bump/Roslyn 2017-02-27 13:15:06 -08:00
Eric Erhardt
c66d3bb6ad Update NuGet version with latest netstandard2.0 build 2017-02-27 14:50:39 -06:00
Justin Goshi
61c1e3e104 Remove duplicate properties 2017-02-27 11:06:44 -08:00
Piotr Puszkiewicz
0a6deabcce Enable multi-proc build of test sln. 2017-02-27 10:34:59 -08:00
Piotr Puszkiewicz
b55b5ad033 Remove duplicate installer suffix 2017-02-27 10:21:42 -08:00
Eric Erhardt
ab887ec024 Merge remote-tracking branch 'upstream/rel/1.0.0' into rel101 2017-02-25 14:30:53 -06:00
Eric Erhardt
23392fa3c3 Merge branch 'rel/1.0.0' into piotrpMSFT/bump/Roslyn 2017-02-25 13:12:35 -06:00
Livar Cunha
9210b84a98 Updating the SDK to 1.0.0-alpha-20170224-6 2017-02-24 15:56:59 -08:00
Livar Cunha
b3da712d3d Updating both platform abstractions and dependency model to 1.0.3. 2017-02-24 14:52:05 -08:00
Unknown
66be1db3fe Bump Roslyn to 2.0.0-rc5-61424-02 2017-02-24 14:11:35 -08:00