This appears to be a difference between the 2.2.0-preview SDK currently
being used in core-sdk and the 2.1.401-preview SDK currently being used
in source-build. In the 2.2.0 SDK, this target happens to run before
the resolved package list is used, but in the 2.1.401 it is not, so I
added the explicit dependency (doesn't affect anything in the 2.2.0 SDK).
* 'master' of /Users/livarcocc/Documents/git/cli: (1063 commits)
Updating signing project to use new intermediate directory (int).
Update runtimeconfig.json doc for 2.1 (#9382)
Shortening the path to the intermediate folder by renaming it to int.
fix typo (#9364)
Updating asp.net to 2.2.0 as well.
Updating the build and tests to work with the 2.2.0 runtime.
Simplified combining dictionaries in Telemetry
Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to "master" (#9362)
Fix extraction of folders (#9335)
Update Sha256Hasher.cs
Fix relative path tool path (#9330)
Insert updated SDK from 2.1.4xx branch
MSBuild 15.8.60
Fix crash when user home directory cannot be determined.
Make `CliFolderPathCalculator` a static class.
Don't add the ReleaseSuffix to the branding on the CLI when DropSuffix is set to true.
Add retry when Directory.Move (#9313)
Override new SdkResult public properties
Add reference to Microsoft.Build.NuGetSdkResolver
Disable crossgen for MSBuild inline-task refs
...
* Publish app host to folder under SDK
* Use carried apphost as shim
* Remove full framework launcher
* Fix test run command issue
* Use latest release/2.1 build
* Test with 32 bit env
* Add missing return
* Update to latest prodcon build
* Add xlfs
* First draft enablement of Win-arm and Linux-arm builds for the CLI.
* Fixing a typo
* Disable tests for arm; enable badges and FinalizeBuild for arm.
* Remove the 'Win-arm' leg.
* Update the README
* Update the README [2]
* Update netci.groovy
* Fixing a hard-coded Architecture: 'linux-x64'; removing the LZMA for 'arm'.
* Creating and publishing '*.symbols.nuget' to the blob feed.
* Reverting 'generatenupkg' methodology.
* Fixing formatting...
* Overwrite should = 'false'
* Second draft - Creating and publishing '*.symbols.nuget' to the blob feed.
* Fixing a VS auto-update.
* Removing the 'Microsoft.SymbolUploader.Build.Task' modifications; need to make a PR just for this.
* Change "sdk.*.Microsoft.DotNet.SDK.*.symbols.nupkg" to "runtime.*.Microsoft.DotNet.SDK.*.symbols.nupkg"; removing the 'DotNetRestore' on the Symbols.csproj
* Removing a 'todo' comment...
* Putting back the 'dotnet restore'
* Fixing a typo...
* Logical separation of the 'nupkg' from the 'symbols.nupkg' enumeration; fixed 'swr' pattern.
* Add "BLOBFEED_STORAGE_CONTAINER"
Extract packages to DotnetTools folder under sdk/{version}
Add new resolver to discover it
Add test to enforce package structure. It will fail when the structure
changed
* dotnet/release/2.1.2xx:
Use satellites from roslyn package, not cli-deps-satellites
Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx
Conflicts:
build/DependencyVersions.props
src/redist/redist.csproj
src/tool_roslyn_satellites/tool_roslyn_satellites.csproj
* dotnet/release/2.0.0: (32 commits)
Update wix version (#8313)
Use explict and non-preview versions for the build DLL
Fixing a typo...
The 15.4.8 version of the Microsoft.Build.Runtime nuget package is currupt; use the replacement 15.4.8.1
Fix dotnet-install to check the right path for no-op installs when --shared-runtime is specified
Fixed a typo...
Nuget.config update to align with CLI:master - add comments in DependencyVersions.prop
Even more package dependency re-names...
Third pass clean-up of package names.
Second pass clean-up of package names; resequencing download.
Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props
The access key is already resolved: 'CoreSetupBlobAccessTokenParam'
Fixed another typo...
Fixed typo...
The first pass will need the extra args [same as run-build.ps1].
Dependency Uptake: download and import a package version props file.
Accounting for MSRC builds with pre-set 'CoreSetupBlobRootUrl' and 'CoreSetupBlobAccessToke' properties.
Changes per code review...
The URL root will include the "dotnet" container; the structure will be identical after the "dotnet" container.
No passwords should be in the open as environmental variables.
...
Conflicts:
build/DependencyVersions.props
src/redist/redist.csproj
src/tool_msbuild/tool_msbuild.csproj
src/tool_roslyn/tool_roslyn.csproj
test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj
* dotnet/release/15.5: (26 commits)
Fixing the reference to Microsoft.Build.Runtime from Cli.Utils.Tests. It was using the wrong package version property.
One more old style version package name needed to change in redist.
Fixing the versions of MSBuild and passing the right property to find roslyn files.
Use "15.5.179" for the other Microsoft.Build.* packages
Moving the 'MicrosoftBuildPackageVersion' forward.
Fixing "RuntimeFrameworkVersion"
Updating version naming convention.
Fixed a typo...
Nuget.config update to align with CLI:master - add comments in DependencyVersions.prop
Even more package dependency re-names...
Third pass clean-up of package names.
Second pass clean-up of package names; resequencing download.
Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props
The access key is already resolved: 'CoreSetupBlobAccessTokenParam'
Fixed another typo...
Fixed typo...
The first pass will need the extra args [same as run-build.ps1].
Dependency Uptake: download and import a package version props file.
Accounting for MSRC builds with pre-set 'CoreSetupBlobRootUrl' and 'CoreSetupBlobAccessToke' properties.
Changes per code review...
...
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj
TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.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/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj
TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj
build/BundledTemplates.props
build/DependencyVersions.props
build/NugetConfigFile.targets
build/Test.targets
build_projects/dotnet-cli-build/dotnet-cli-build.csproj
dir.props
run-build.sh
src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj
src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj
src/dotnet/dotnet.csproj
src/redist/redist.csproj
src/tool_fsharp/tool_fsc.csproj
test/ArgumentForwardingTests/ArgumentForwardingTests.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/Microsoft.DotNet.Cli.Utils.Tests.csproj
test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj
test/binding-redirects.Tests/binding-redirects.Tests.csproj
test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj
test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj
test/dotnet-back-compat.Tests/dotnet-back-compat.Tests.csproj
test/dotnet-help.Tests/dotnet-help.Tests.csproj
test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj
test/dotnet-new.Tests/dotnet-new.Tests.csproj
test/dotnet-remove-package.Tests/dotnet-remove-package.Tests.csproj
test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj
test/dotnet-restore.Tests/dotnet-restore.Tests.csproj
test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj
test/dotnet.Tests/dotnet.Tests.csproj
* dotnet/release/2.0.0:
Fixed a typo...
Nuget.config update to align with CLI:master - add comments in DependencyVersions.prop
Even more package dependency re-names...
Third pass clean-up of package names.
Second pass clean-up of package names; resequencing download.
Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props
The access key is already resolved: 'CoreSetupBlobAccessTokenParam'
Fixed another typo...
Fixed typo...
The first pass will need the extra args [same as run-build.ps1].
Dependency Uptake: download and import a package version props file.
Conflicts:
build/DependencyVersions.props
src/redist/redist.csproj
src/tool_roslyn/tool_roslyn.csproj
We were publishing a -debug zip with sdk code and symbols, but it was captured before
publishing was finished and had incorrect code content. Trying to use it would blow up
due to incorrect runtimeconfig.json.
Replace it with a -symbols zip that contains only symbols and that can be overlayed
over the main zip. This is just like the -langpack zip that has satellite assemblies.
Also add an option to leave the PDBs in the same directory/packages as code:
/p:SeparateSymbolsArchive=false. Setting this on local builds facilitates
debugging and profiling by removing the need to adjust symbol paths or copy PDBs
around.
* dotnet/release/15.5: (21 commits)
Manually merging some changes that git merged wrong and deleted from the 15.5 branch.
Separating the 'legacy' URL construction from the 'current' URL construction methods and logic.
Use temporary path for fake deps.json in test
Use same build number for roslyn and F# satellites
Updating Roslyn satellites and SDK versions
Insert NuGet Build 4.5.0-preview2-4529 into cli
Update NuGet to 4529 (signed)
MSBuild 15.5.154
MSBuild 15.5.153
removed commented out config I'd meant to remove
added a way to specify the asp.net template versions
Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
'NuGet.master.config' does not appear to be used.
Fixed tests
Update branch info to release/15.5
Updating the websdk version to 2.0.0-rel-20171010-665
Insert NuGet Build 4.5.0-preview1-4526 into cli
Update DependencyVersions.props
Updated version of TestPlatform to 15.5.0-preview-20170923-02
MSBuild 15.4.8
...
1. Publish satellites with a separate project and merge the resulting .deps.json
into (csc|vbc).deps.json
2. Move the build tasks satellites to the correct location next to main assembly
(one level higher than bincore\)
Remove non MIT licensed components from the CLI when building on non
windows platforms. The shared framework provides the LICENSE file that is
included with the tarballs, so we just need to ensure we don't pull any
windows specific stuff that is not MIT licensed.
Fixes: dotnet/core-setup#676
* dotnet/release/2.0.0: (72 commits)
Updating the signing project to reflect the new location of the resolver.
Another update to MSBuild. To 15.3.0-preview-000385-01.
Another update to msbuild. To 15.3.0-preview-000385-01.
Update to SetupCrossgen 183 - Coherence 25615
Don't include .NET Core MS.NET.Build.Extensions tasks for .NET Framework and vice versa
Update version of SDK and MS.NET.Build.Extensions, adapt to layout change
Updating MSBuild to 15.3.0-preview-000384-01
Update MSBuild to 15.3.0-preview-000384-01
test pack command
Changing NuGet version to Preview3-4154
Updating NuGet version to Preview3-4154
Add Microsoft.NET.Build.Extensions files to package for VS insertion
reenable smoke test of F# templates
empty commit
Don't try to CrossGen .NET Framework support DLLs
Update test platform to 15.3.0-preview-20170609-02.
Turning off implicit restore when publishing the build project.
Updating the vstest.console to use the same runtime that is shipping with the CLI.
Update to template build 256 to fix Web Auth scenarios
Add test for consuming .NET Standard 2.0 library from .NET Framework 4.6.1 project
...
Remove ProjectJsonMigration and its test from solution file
Change dependecy by package reference instead of project 2 project
Construct the sln and dotnet new with wrapper that is used in migrate
package
Add reference to Nuget ProjectModel etc since CrossGen need it and it
cannot automatically get the reference
* update nuget to 4.0.0-rc3 and sdk to 1.0.0-alpha-20170105-5
* Modifying restore project.json to use the project.json stage0 CLI instead of restore-projectjson command.
* add a nuget dependency so migrated project has packageref and generates an assets file on restore
* Bump MSBuild Version to 15.1.0-preview-000503-01
* tool_csc->tool_roslyn
* pull some properties up to dir.props
* Move Roslyn to "Roslyn" subdirectory
* Fix relative paths in RunCsc.*
* Add removal of csc & vbc from deps.json
* Revert roslyn to 2.0.0-rc3-61212-03
* netcoreapp -> 1.0.3
* Update testplatform packages version
* Refer TestPlatform version from DependencyVersions.props
* Updating the packages with respect to Testplatform release 15.0.0-preview-20161227-02
* Add dit.props to test assets projects
* WIP Migrate sln files
* WIP add reference to redist
* Adding tests and fixing a few bugs
* Fix some tests
* Remove use of DeepClone
* Fix test build errors
* Fix more tests
* Centralize Microsoft.Net.Sdk package version
Note: Templates were omitted as their version needs to be static.
* Unifying additional missmatched versions
* prefercliruntime
whitespace threw off ReplaceAll
* Additional missed globs
* Revert SDK version for performance tests
* PR Feedback
* Roll back VSTestXunitDesktopAndNetCore.csproj SDK version
* Bug fixes
* Nitpick
* -Fixed failed tests
-Added test to cover trx logger scenario.
* Fix for issue https://github.com/Microsoft/vstest/issues/241
* Fix for failed test. We have taken fix where dotnet test will return nonzero if test fails. In multi TFM scenario if test fails it termates the whole process as dotnet test is returning 1. As a fix of this we should continue if some test fails for next TFM
* Bump Microsoft.Testplatform.CLI and Microsoft.NET.Test.Sdk version
* Updating the Microsoft.Net.Sdk & Microsoft.Net.Sdk.Web versions
* Fixed merge conflicts. Had to re-update the Sdk version in one place.
* re-migrate dotnet.dll
* Revert Performance Test Projects
* Fix test test
* Add missing WithRuntime
* Disable failing test test
* Upgrade MSBuild references to 15.1.0-preview-000370-00
* Custom logger for MSBuild to receive telemetry events
Had to make the telemetry session ID a static variable so that the forwarding app could use it.
I've tested this all manually and will be writing tests after everyone signs off on the implementation here.
2) Added test to address above change
3) Crossgen were creating problem for full CLR built assemblies. Removed All those assembly from Crossgen list.
4) Removed the line of code which were deleting Extensions folder under sdk folder as this folder contain trx logger dlls
* Implemented vstest verb which will run the test from given container.
* Fixed Nitpick.
* 1) Addressed PR comment
2) Added tests for vstest verb
* Using specific version of Microsoft.TestPlatform.
* Address PR comments.
Modified help text for the vstest command.
Removed unused function.
* Fixed package related issue.
--Taking reference of microsoft.testplatform.cli nuget package which has contentFolder in it so that sub folder of this nuget can also be added in cli package.
-- Removing vstest.console, vshost and datacollector from Bundletools as we dont want *.deps.json to be override
* Nitpick
* Making vstest.console arguments compatible for non windows platform
* Fix tests to run on linux machine
* Updated the microsoft.testplatform.cli nuget package version. This version has fix related to non windows machine.
* changed dapter path from bin/debug to bin/Debug
* updated nuget version of package Microsoft.TestPlatform.CLI.
* Revert "updated nuget version of package Microsoft.TestPlatform.CLI."
This reverts commit bcc26c21d11c2bd2e5259a74f9890b0fd75962c7.
* Updated version of nuget package Microsoft.TestPlatform.CLI
Added Test project in solution file
* Addressed PR comment.
* Removed unnecessary --platform argument from test
Update Microsoft.Extensions.DependencyModel to 1.0.1-beta-000933
Update Microsoft.DotNet.PlatformAbstraction to 1.0.1-beta-000933
Update NuGet to 3.6.0-beta.1.msbuild.4
Update dotnet-test-xunit to 1.0.0-rc2-350904-49
