Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit a998449
Merge: 17b6d91 cc4a38e
Author: Stephen Bonikowsky <[email protected]>
Date:   Thu Mar 22 10:50:37 2018 -0700

    Merge pull request dotnet#2678 from dotnet-maestro-bot/master-UpdateDependencies

    Update BuildTools, CoreClr, CoreFx, Standard, WCF to preview3-02622-01, preview3-26322-06, preview3-26322-06, preview1-26322-01, preview2-26322-01, respectively (master)

commit cc4a38e
Author: dotnet-maestro-bot <[email protected]>
Date:   Thu Mar 22 07:27:34 2018 -0700

    Update BuildTools, CoreClr, CoreFx, Standard, WCF to preview3-02622-01, preview3-26322-06, preview3-26322-06, preview1-26322-01, preview2-26322-01, respectively

commit 17b6d91
Merge: 1a0e4af 42bd929
Author: Miguel Lacouture <[email protected]>
Date:   Wed Mar 21 12:47:24 2018 -0700

    Merge pull request dotnet#2699 from dotnet/dev/miguell/wcf/wcftools/D15.7P2

    VS 2017 d15.7 P2 Release Notes

commit 42bd929
Author: Miguel Lacouture <[email protected]>
Date:   Mon Mar 19 10:32:24 2018 -0700

    VS 2017 d15.7 P2 Release Notes

commit 1a0e4af
Merge: 10ef848 b35d321
Author: Stephen Bonikowsky <[email protected]>
Date:   Wed Mar 14 17:12:02 2018 -0700

    Merge pull request dotnet#2671 from dotnet-maestro-bot/master-UpdateDependencies

    Update BuildTools, CoreClr, CoreFx, Standard, WCF to preview2-02612-03, preview2-26313-16, preview2-26313-03, preview1-26313-01, preview2-26314-01, respectively (master)

commit b35d321
Author: dotnet-maestro-bot <[email protected]>
Date:   Wed Mar 14 02:14:26 2018 -0700

    Update BuildTools, CoreClr, CoreFx, Standard, WCF to preview2-02612-03, preview2-26313-16, preview2-26313-03, preview1-26313-01, preview2-26314-01, respectively

commit 10ef848
Merge: 62015ac 75013d8
Author: Miguel Lacouture <[email protected]>
Date:   Tue Mar 13 14:30:13 2018 -0700

    Merge pull request dotnet#2672 from dotnet/dev/miguell/wcf/wcftools/D15.7P1

    Release notes for 15.7 Preview 1

commit 75013d8
Author: Miguel Lacouture <[email protected]>
Date:   Wed Mar 7 19:08:01 2018 -0800

    Release notes for 15.7 Preview 1

commit 62015ac
Merge: 17fb53a 855a423
Author: Stephen Bonikowsky <[email protected]>
Date:   Mon Mar 12 12:07:25 2018 -0700

    Merge pull request dotnet#2669 from dotnet-maestro-bot/master-UpdateDependencies

    Update BuildTools, CoreClr, CoreFx, Standard, WCF to preview2-02612-02, preview2-26310-01, preview2-26312-02, preview1-26312-01, preview2-26312-01, respectively (master)

commit 855a423
Author: dotnet-maestro-bot <[email protected]>
Date:   Mon Mar 12 11:29:17 2018 -0700

    Update BuildTools, CoreClr, CoreFx, Standard, WCF to preview2-02612-02, preview2-26310-01, preview2-26312-02, preview1-26312-01, preview2-26312-01, respectively

commit 17fb53a
Merge: ec309db 2dba915
Author: Stephen Bonikowsky <[email protected]>
Date:   Fri Mar 9 14:33:45 2018 -0800

    Merge pull request dotnet#2666 from dotnet-maestro-bot/master-UpdateDependencies

    Update BuildTools, CoreClr, Standard to preview2-02609-01, preview2-26309-06, preview1-26309-01, respectively (master)

commit 2dba915
Author: dotnet-maestro-bot <[email protected]>
Date:   Fri Mar 9 12:51:00 2018 -0800

    Update BuildTools, CoreClr, Standard to preview2-02609-01, preview2-26309-06, preview1-26309-01, respectively

commit ec309db
Merge: c06f5cd bb0be94
Author: Stephen Bonikowsky <[email protected]>
Date:   Fri Mar 9 09:32:49 2018 -0800

    Merge pull request dotnet#2663 from dotnet-maestro-bot/master-UpdateDependencies

    Update CoreClr, WCF to preview2-26308-11, preview2-26309-02, respectively (master)

commit bb0be94
Author: dotnet-maestro-bot <[email protected]>
Date:   Fri Mar 9 00:48:13 2018 -0800

    Update CoreClr, WCF to preview2-26308-11, preview2-26309-02, respectively

commit c06f5cd
Merge: f1eaa66 4b24dc1
Author: Stephen Bonikowsky <[email protected]>
Date:   Thu Mar 8 16:45:56 2018 -0800

    Merge pull request dotnet#2662 from StephenBonikowsky/stebon/master/UseLKGPkgOfM.P.C.UAP

    Use LKG version of Microsoft.Private.CoreFx.UAP

commit 4b24dc1
Author: Stephen Bonikowsky <[email protected]>
Date:   Thu Mar 8 15:31:20 2018 -0800

    Use LKG version of Microsoft.Private.CoreFx.UAP

    * This package was broken recently in CoreFx, use last known good version and disable auto update until it has been fixed.

commit f1eaa66
Merge: 22fbb71 67b900c
Author: Stephen Bonikowsky <[email protected]>
Date:   Thu Mar 8 15:35:38 2018 -0800

    Merge pull request dotnet#2657 from dotnet-maestro-bot/master-UpdateDependencies

    Update CoreFx to preview2-26308-09 (master)

commit 22fbb71
Author: Paulo Janotti <[email protected]>
Date:   Thu Mar 8 14:51:58 2018 -0800

    Revert previous commit

commit a794250
Author: Paulo Janotti <[email protected]>
Date:   Thu Mar 8 14:50:18 2018 -0800

    Set env vars to test with SocketsHttpHandler on CoreFX 2.1

commit 67b900c
Author: dotnet-maestro-bot <[email protected]>
Date:   Thu Mar 8 11:54:40 2018 -0800

    Update CoreFx to preview2-26308-09

commit 210add5
Merge: bc3e898 995c394
Author: Stephen Bonikowsky <[email protected]>
Date:   Thu Mar 8 09:19:26 2018 -0800

    Merge pull request dotnet#2655 from dotnet-maestro-bot/master-UpdateDependencies

    Update BuildTools, CoreClr, CoreFx, Standard to preview2-02607-03, preview2-26308-06, preview2-26308-06, preview1-26308-01, respectively (master)

commit 995c394
Author: dotnet-maestro-bot <[email protected]>
Date:   Thu Mar 8 07:01:28 2018 -0800

    Update BuildTools, CoreClr, CoreFx, Standard to preview2-02607-03, preview2-26308-06, preview2-26308-06, preview1-26308-01, respectively

commit bc3e898
Merge: 6565e9b da0e0bf
Author: Stephen Bonikowsky <[email protected]>
Date:   Wed Mar 7 12:34:27 2018 -0800

    Merge pull request dotnet#2632 from StephenBonikowsky/stebon/master/RenableClientCredTests

    Issue for skipping these tests has been closed in core-eng

commit 6565e9b
Merge: 3ed3aa8 f2bb63d
Author: Stephen Bonikowsky <[email protected]>
Date:   Wed Mar 7 11:28:43 2018 -0800

    Merge pull request dotnet#2649 from joperezr/UpdateUAPTFM

    Updating UAPvNext TFM

commit 3ed3aa8
Merge: dd1f547 50dfe85
Author: Stephen Bonikowsky <[email protected]>
Date:   Wed Mar 7 10:31:32 2018 -0800

    Merge pull request dotnet#2651 from dotnet-maestro-bot/master-UpdateDependencies

    Update CoreClr, CoreFx to preview2-26307-01, preview2-26307-06, respectively (master)

commit 50dfe85
Author: dotnet-maestro-bot <[email protected]>
Date:   Wed Mar 7 07:04:07 2018 -0800

    Update CoreClr, CoreFx to preview2-26307-01, preview2-26307-06, respectively

commit dd1f547
Merge: d94d217 270afe4
Author: Stephen Bonikowsky <[email protected]>
Date:   Tue Mar 6 16:03:35 2018 -0800

    Merge pull request dotnet#2650 from dotnet-maestro-bot/master-UpdateDependencies

    Update BuildTools, CoreFx to preview2-02606-05, preview2-26306-04, respectively (master)

commit f2bb63d
Author: Jose Perez Rodriguez <[email protected]>
Date:   Tue Mar 6 15:57:58 2018 -0800

    Updating packageIndex

commit 270afe4
Author: dotnet-maestro-bot <[email protected]>
Date:   Tue Mar 6 15:18:10 2018 -0800

    Update BuildTools, CoreFx to preview2-02606-05, preview2-26306-04, respectively

commit d94d217
Merge: b3aa433 df3b98d
Author: Stephen Bonikowsky <[email protected]>
Date:   Tue Mar 6 10:20:58 2018 -0800

    Merge pull request dotnet#2634 from dotnet-maestro-bot/master-UpdateDependencies

    Update BuildTools, CoreClr, CoreFx, Standard, WCF to preview2-02606-01, preview2-26306-01, preview2-26305-02, preview1-26228-01, preview2-26306-01, respectively (master)

commit b3aa433
Author: Zhenlan Wang <[email protected]>
Date:   Tue Mar 6 10:01:26 2018 -0800

    Fix the tag of 2.1 preview1 in release notes (dotnet#2639)

commit df3b98d
Author: dotnet-maestro-bot <[email protected]>
Date:   Tue Mar 6 02:14:26 2018 -0800

    Update BuildTools, CoreClr, CoreFx, Standard, WCF to preview2-02606-01, preview2-26306-01, preview2-26305-02, preview1-26228-01, preview2-26306-01, respectively

commit 50fdde6
Author: Jose Perez Rodriguez <[email protected]>
Date:   Mon Mar 5 17:45:30 2018 -0800

    Updating UAPvNext TFM

commit b555d3b
Author: Zhenlan Wang <[email protected]>
Date:   Thu Mar 1 19:03:14 2018 -0800

    Update release notes for 2.1 preview 1 (dotnet#2631)

commit da0e0bf
Author: Stephen Bonikowsky <[email protected]>
Date:   Thu Mar 1 16:27:12 2018 -0800

    Issue for skipping these tests has been closed in core-eng

    * WCF issue dotnet#1886, tracking a core-eng issue dotnet/core-eng#775 which has been closed as fixed.
    * The tests should now work.

commit 24470b0
Merge: c365d1a c69d4e8
Author: Huangli Wu <[email protected]>
Date:   Wed Feb 28 16:46:31 2018 -0800

    Merge pull request dotnet#2623 from huanwu/svcutibuildfiles

    Add svcutilcore target, prefercliruntime and json files.

commit c365d1a
Merge: 9087381 7a80766
Author: Stephen Bonikowsky <[email protected]>
Date:   Wed Feb 28 16:20:28 2018 -0800

    Merge pull request dotnet#2625 from StephenBonikowsky/stebon/master/ActiveIssue2624

    Skipping test case for WCF Issue dotnet#2624

commit c69d4e8
Author: Huangli Wu <[email protected]>
Date:   Wed Feb 28 15:50:29 2018 -0800

    Update targets and json files.

commit 9087381
Merge: 84a66ea 4e824bb
Author: Stephen Bonikowsky <[email protected]>
Date:   Wed Feb 28 14:55:20 2018 -0800

    Merge pull request dotnet#2627 from StephenBonikowsky/stebon/master/ActiveIssue2626

    Skipping test case for WCF Issue dotnet#2626

commit 84a66ea
Merge: e445902 85ddd35
Author: Stephen Bonikowsky <[email protected]>
Date:   Wed Feb 28 14:55:00 2018 -0800

    Merge pull request dotnet#2628 from StephenBonikowsky/stebon/master/FixAutoUpdateForTestILC

    Comment out update step for ProjectNTfsTestILC

commit 18925d8
Author: Huangli Wu <[email protected]>
Date:   Wed Feb 28 13:20:07 2018 -0800

    rename folder name

commit 85ddd35
Author: Stephen Bonikowsky <[email protected]>
Date:   Wed Feb 28 12:44:08 2018 -0800

    Comment out update step for ProjectNTfsTestILC

    * Missed one update section in previous PR, this causes an auto-update error.

commit 7a80766
Author: Stephen Bonikowsky <[email protected]>
Date:   Wed Feb 28 12:24:05 2018 -0800

    Fixing VS's attempt to help me!#%!!

commit 4e824bb
Author: Stephen Bonikowsky <[email protected]>
Date:   Wed Feb 28 12:19:38 2018 -0800

    Skipping test case for WCF Issue dotnet#2626

    * Test Case: ExpectedExceptionTests/ServiceRestart_Throws_CommunicationException

commit 8008558
Author: Stephen Bonikowsky <[email protected]>
Date:   Wed Feb 28 11:34:35 2018 -0800

    Skipping test case for WCF Issue dotnet#2624

    * Test case: Binding_Http_BasicHttpBindingTests/HttpKeepAliveDisabled_Echo_RoundTrips_True

commit 1e97381
Author: Huangli Wu <[email protected]>
Date:   Wed Feb 28 10:43:37 2018 -0800

    Add svcutilcore target, prefercliruntime and json files.

commit e445902
Author: Zhenlan Wang <[email protected]>
Date:   Wed Feb 28 00:42:49 2018 -0800

    Fix references for building UAP (dotnet#2622)

commit 11ee862
Merge: ae2e2fe 03bfee7
Author: Stephen Bonikowsky <[email protected]>
Date:   Tue Feb 27 17:59:53 2018 -0800

    Merge pull request dotnet#2621 from StephenBonikowsky/stebon/master/PortHarvestFixFrom2.1.0

    Move win7 harvested binaries under runtimes/win/lib

commit 03bfee7
Author: Stephen Bonikowsky <[email protected]>
Date:   Tue Feb 27 15:56:23 2018 -0800

    Move win7 harvested binaries under runtimes/win/lib

    * On Win10 machines NuGet is picking win7 instead of win which is technically correct.
    * Moving the win7 assets under win/lib/<TFM> fixes the problem.

commit ae2e2fe
Merge: 373bb25 3fb7fa2
Author: Stephen Bonikowsky <[email protected]>
Date:   Tue Feb 27 16:06:45 2018 -0800

    Merge pull request dotnet#2616 from StephenBonikowsky/stebon/master/UpdateWcfPRServiceSerialNums

    Adding an entry for 2.0.0 for WcfPRService serial numbers

commit 3fb7fa2
Author: Stephen Bonikowsky <[email protected]>
Date:   Tue Feb 27 14:31:10 2018 -0800

    Adding an entry for 2.0.0 for WcfPRService serial numbers

commit 373bb25
Merge: cf311b5 ceffaea
Author: Huangli Wu <[email protected]>
Date:   Tue Feb 27 14:27:13 2018 -0800

    Merge pull request dotnet#2574 from huanwu/svcutilpackage

    Add package for svcutilcore

commit cf311b5
Author: Zhenlan Wang <[email protected]>
Date:   Tue Feb 27 09:22:05 2018 -0800

    Clean up references from System.Private.ServiceModel.csproj (dotnet#2609)

commit ceffaea
Author: Huangli Wu <[email protected]>
Date:   Mon Feb 26 16:52:42 2018 -0800

    Update the comment for SkipValidatePackage

commit de730ea
Merge: d5d9593 72804a4
Author: Stephen Bonikowsky <[email protected]>
Date:   Mon Feb 26 16:27:57 2018 -0800

    Merge pull request dotnet#2603 from StephenBonikowsky/stebon/master/DisableProjectNtfsAutoUpdate

    Disable auto update of ProjectNtfs

commit 72804a4
Author: Stephen Bonikowsky <[email protected]>
Date:   Mon Feb 26 13:29:29 2018 -0800

    Disable auto update of ProjectNtfs

    * Support for UWP is currently broken, disabling the sections of the dependencies.props file that auto updated versions of files needed for UWP.

commit d5d9593
Merge: 84cfc02 4958b3c
Author: Stephen Bonikowsky <[email protected]>
Date:   Mon Feb 26 13:18:03 2018 -0800

    Merge pull request dotnet#2600 from StephenBonikowsky/stebon/master/UpdateNetciGroovyForUwp6.1

    Updating netci serial numbers for supported branches.

commit 84cfc02
Merge: f750f5b e341a6d
Author: Stephen Bonikowsky <[email protected]>
Date:   Mon Feb 26 13:17:20 2018 -0800

    Merge pull request dotnet#2602 from dotnet-maestro-bot/master-UpdateDependencies

    Update CoreFx, ProjectNTfs, ProjectNTfsTestILC, Standard, WCF to preview2-26225-02, beta-26226-00, beta-26226-00, preview1-26226-01, preview2-26225-01, respectively (master)

commit e341a6d
Author: dotnet-maestro-bot <[email protected]>
Date:   Mon Feb 26 11:01:14 2018 -0800

    Update CoreFx, ProjectNTfs, ProjectNTfsTestILC, Standard, WCF to preview2-26225-02, beta-26226-00, beta-26226-00, preview1-26226-01, preview2-26225-01, respectively

commit f750f5b
Merge: 02aea45 e0046f6
Author: Stephen Bonikowsky <[email protected]>
Date:   Sat Feb 24 10:03:57 2018 -0800

    Merge pull request dotnet#2592 from dotnet-maestro-bot/master-UpdateDependencies

    Update CoreClr, CoreFx, WCF to preview2-26222-07, preview2-26224-02, preview2-26224-01, respectively (master)

commit e0046f6
Author: dotnet-maestro-bot <[email protected]>
Date:   Sat Feb 24 06:57:35 2018 -0800

    Update CoreClr, CoreFx, WCF to preview2-26222-07, preview2-26224-02, preview2-26224-01, respectively

commit 02aea45
Merge: 54633f6 ce1c23e
Author: Stephen Bonikowsky <[email protected]>
Date:   Fri Feb 23 17:35:48 2018 -0800

    Merge pull request dotnet#2595 from dagood/update-buildtools/master

    Update BuildTools to 2.1.0-preview2-02522-03

commit 4958b3c
Author: Stephen Bonikowsky <[email protected]>
Date:   Fri Feb 23 17:03:17 2018 -0800

    Updating netci serial numbers for supported branches.

commit ce1c23e
Author: Davis Goodin <[email protected]>
Date:   Fri Feb 23 15:55:12 2018 -0600

    Update BuildTools to 2.1.0-preview2-02522-03

commit 54633f6
Author: Matt Connew <[email protected]>
Date:   Wed Jan 31 18:12:36 2018 -0800

    Add the ability to replace or customize the HttpMessageHandler

commit c139e81
Author: dotnet-maestro-bot <[email protected]>
Date:   Thu Feb 22 11:38:09 2018 -0600

    Update CoreClr, CoreFx, Standard, WCF to preview2-26222-05, preview2-26222-04, preview1-26222-01, preview2-26222-01, respectively (dotnet#2590)

commit 6bdc303
Author: dotnet-maestro-bot <[email protected]>
Date:   Thu Feb 22 01:43:03 2018 -0600

    Update CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC to preview2-26222-01, preview2-26222-01, beta-26222-00, beta-26222-00, respectively (dotnet#2589)

commit 125e96c
Author: dotnet-maestro-bot <[email protected]>
Date:   Wed Feb 21 19:54:22 2018 -0600

    Update BuildTools to preview2-02521-06 (dotnet#2586)

commit de3a148
Author: Huangli Wu <[email protected]>
Date:   Wed Feb 21 13:40:25 2018 -0800

    Update the description.

commit e56b3bb
Author: Huangli Wu <[email protected]>
Date:   Wed Feb 21 12:04:17 2018 -0800

    Update description and remove unused line in pkgproj.

commit fa99bb4
Author: dotnet-maestro-bot <[email protected]>
Date:   Wed Feb 21 12:13:30 2018 -0600

    Update BuildTools, CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC, Standard, WCF to preview2-02521-02, preview2-26221-06, preview2-26221-05, beta-26221-00, beta-26221-00, preview1-26221-01, preview2-26221-01, respectively (dotnet#2584)

commit ab08229
Author: Stephen Bonikowsky <[email protected]>
Date:   Tue Feb 20 17:54:37 2018 -0800

    Expose the Close method. (dotnet#2577)

    Expose the Close method on ClientBase<TChannel>

commit a20da8e
Author: Huangli Wu <[email protected]>
Date:   Tue Feb 20 15:50:01 2018 -0800

    revert the changes in packageindex.json

commit 2f78dd0
Author: dotnet-maestro-bot <[email protected]>
Date:   Tue Feb 20 14:59:16 2018 -0600

    Update BuildTools, CoreClr, ProjectNTfs, ProjectNTfsTestILC, Standard, WCF to preview2-02520-02, preview2-26220-05, beta-26220-01, beta-26220-01, preview1-26220-01, preview2-26220-01, respectively (dotnet#2580)

commit cdda732
Author: dotnet-maestro-bot <[email protected]>
Date:   Fri Feb 16 13:27:35 2018 -0600

    Update BuildTools, CoreFx, ProjectNTfs, ProjectNTfsTestILC, Standard, WCF to preview2-02516-02, preview2-26216-03, beta-26216-00, beta-26216-00, preview1-26216-01, preview2-26216-01, respectively (dotnet#2579)

commit d16b6ca
Merge: 7aa9c4c 1f02922
Author: Stephen Bonikowsky <[email protected]>
Date:   Thu Feb 15 15:42:40 2018 -0800

    Merge pull request dotnet#2578 from dotnet-maestro-bot/master-UpdateDependencies

    Update BuildTools to preview2-02515-02 (master)

commit 1f02922
Author: dotnet-maestro-bot <[email protected]>
Date:   Thu Feb 15 14:11:55 2018 -0800

    Update BuildTools to preview2-02515-02

commit 7aa9c4c
Merge: f6c85f0 4037cc5
Author: Stephen Bonikowsky <[email protected]>
Date:   Thu Feb 15 13:14:06 2018 -0800

    Merge pull request dotnet#2572 from StephenBonikowsky/stebon/master/BasicHttpSecurity_Public_Ctor

    Make BasicHttpSecurity default constructor public in the contract.

commit f6c85f0
Author: dotnet-maestro-bot <[email protected]>
Date:   Thu Feb 15 14:49:25 2018 -0600

    Update BuildTools, CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC, Standard to preview2-02515-01, preview2-26214-07, preview2-26215-04, beta-26215-00, beta-26215-00, preview1-26215-01, respectively (dotnet#2575)

commit 842501d
Author: Huangli Wu <[email protected]>
Date:   Wed Feb 14 16:51:11 2018 -0800

    Add package for svcutilcore

commit 4037cc5
Author: Stephen Bonikowsky <[email protected]>
Date:   Wed Feb 14 16:31:26 2018 -0800

    Make BasicHttpSecurity default constructor public in the contract.

    * Already public in the implementation.
    * If BasicHttpSecurityMode is set to Message or TransportWithMessageCredential throw PNSE.
    * Fixes dotnet#2365

commit 4df27d4
Author: dotnet-maestro-bot <[email protected]>
Date:   Wed Feb 14 13:27:28 2018 -0600

    Update CoreClr, ProjectNTfs, ProjectNTfsTestILC, WCF to preview2-26213-07, beta-26214-00, beta-26214-00, preview2-26214-01, respectively (dotnet#2568)

commit cd97b9f
Merge: 79a74ee c8643e9
Author: Stephen Bonikowsky <[email protected]>
Date:   Tue Feb 13 15:26:37 2018 -0800

    Merge pull request dotnet#2564 from StephenBonikowsky/stebon/master/ExposeChannelTerminatedException

    Expose ChannelTerminatedException in the S.SM.Primitives contract.

commit c8643e9
Author: Stephen Bonikowsky <[email protected]>
Date:   Tue Feb 13 13:57:51 2018 -0800

    Move ChannelTerminatedException to correct namespace section.

    * Moved ChannelTerminatedException from System.ServiceModel.Channels to System.ServiceModel

commit 79a74ee
Merge: 5d59c96 d8731a9
Author: Stephen Bonikowsky <[email protected]>
Date:   Tue Feb 13 13:37:39 2018 -0800

    Merge pull request dotnet#2567 from dotnet-maestro-bot/master-UpdateDependencies

    Update WCF to preview2-26213-02 (master)

commit d8731a9
Author: dotnet-maestro-bot <[email protected]>
Date:   Tue Feb 13 11:49:57 2018 -0800

    Update WCF to preview2-26213-02

commit 5d59c96
Merge: 78c8118 11636b9
Author: Stephen Bonikowsky <[email protected]>
Date:   Tue Feb 13 11:31:23 2018 -0800

    Merge pull request dotnet#2562 from StephenBonikowsky/stebon/master/SkipFailingTestOnSles

    Skip test WebSocket_Https_Duplex_TextStreamed

commit 91ffa06
Author: Stephen Bonikowsky <[email protected]>
Date:   Tue Feb 13 11:29:24 2018 -0800

    Expose ChannelTerminatedException in the S.SM.Primitives contract.

    * Fixes dotnet#1962

commit 11636b9
Author: Stephen Bonikowsky <[email protected]>
Date:   Tue Feb 13 10:40:17 2018 -0800

    Skip test WebSocket_Https_Duplex_TextStreamed

    * Skip while the failure is investigated.
    * Only failing on SLES, not other Linux OSes or even opensuse.423

commit 78c8118
Merge: 5a2a738 6be82ac
Author: Stephen Bonikowsky <[email protected]>
Date:   Tue Feb 13 10:36:24 2018 -0800

    Merge pull request dotnet#2560 from dotnet-maestro-bot/master-UpdateDependencies

    Update BuildTools, CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC, Standard, WCF to preview2-02513-01, preview2-26213-05, preview2-26213-06, beta-26213-00, beta-26213-00, preview1-26213-01, preview2-26213-01, respectively (master)

commit 6be82ac
Author: dotnet-maestro-bot <[email protected]>
Date:   Tue Feb 13 08:35:41 2018 -0800

    Update BuildTools, CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC, Standard, WCF to preview2-02513-01, preview2-26213-05, preview2-26213-06, beta-26213-00, beta-26213-00, preview1-26213-01, preview2-26213-01, respectively

commit 5a2a738
Merge: c5de928 2458da1
Author: Stephen Bonikowsky <[email protected]>
Date:   Mon Feb 12 17:47:18 2018 -0800

    Merge pull request dotnet#2556 from dotnet-maestro-bot/master-UpdateDependencies

    Update CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC, Standard, WCF to preview2-26212-05, preview2-26212-05, beta-26212-00, beta-26212-00, preview1-26212-01, preview2-26212-01, respectively (master)

commit c5de928
Merge: ccc6dab 40ff2c5
Author: Stephen Bonikowsky <[email protected]>
Date:   Mon Feb 12 17:47:01 2018 -0800

    Merge pull request dotnet#2554 from StephenBonikowsky/stebon/master/AddRidTest

    Update test infrastructure to detect what OS it is running on.

commit ccc6dab
Merge: a091309 86b6423
Author: Miguel Lacouture <[email protected]>
Date:   Mon Feb 12 16:35:05 2018 -0800

    Merge pull request dotnet#2558 from dotnet/dev/miguell/wcf/wcftools/D15.6P4

    Notes for D15.6 P4

commit 86b6423
Author: Miguel Lacouture <[email protected]>
Date:   Mon Feb 12 11:09:13 2018 -0800

    Notes for D15.6 P4

commit 2458da1
Author: dotnet-maestro-bot <[email protected]>
Date:   Mon Feb 12 06:44:49 2018 -0800

    Update CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC, Standard, WCF to preview2-26212-05, preview2-26212-05, beta-26212-00, beta-26212-00, preview1-26212-01, preview2-26212-01, respectively

commit a091309
Author: dotnet-maestro-bot <[email protected]>
Date:   Sun Feb 11 12:53:20 2018 -0600

    Update BuildTools, CoreClr, CoreFx, WCF to preview2-02511-02, preview2-26211-03, preview2-26211-04, preview2-26211-01, respectively (dotnet#2555)

commit 6277cbe
Author: dotnet-maestro-bot <[email protected]>
Date:   Fri Feb 9 23:00:06 2018 -0600

    Update BuildTools, CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC, Standard, WCF to preview2-02509-01, preview2-26209-08, preview2-26210-01, beta-26209-02, beta-26209-02, preview1-26209-01, preview2-26209-09, respectively (dotnet#2552)

commit 40ff2c5
Author: Stephen Bonikowsky <[email protected]>
Date:   Fri Feb 9 16:14:53 2018 -0800

    Remove TestNugetRuntimeId where used, now obsolete.

commit c377d64
Author: Stephen Bonikowsky <[email protected]>
Date:   Fri Feb 9 13:59:30 2018 -0800

    Update test infrastructure to detect what OS it is running on.

    * This has been broken since moving to buildtoolsv2 as the 'TestNugetRuntimeId' property that was used for this purpose was removed.
    * Also removing a few OS versions that are EOL and adding a couple new ones.
    * Adding a test case that can be enabled whenever a new OS version is added to the lab so the RID can be confirmed in a temp run and then added to Infrastructure.Common

commit 90f9248
Author: dotnet-maestro-bot <[email protected]>
Date:   Fri Feb 9 00:55:45 2018 -0600

    Update CoreClr, WCF to preview2-26208-05, preview2-26209-05, respectively (dotnet#2551)

commit 468b1f0
Author: dotnet-maestro-bot <[email protected]>
Date:   Thu Feb 8 11:57:52 2018 -0600

    Update CoreClr, ProjectNTfs, ProjectNTfsTestILC, WCF to preview2-26207-13, beta-26208-00, beta-26208-00, preview2-26208-02, respectively (dotnet#2549)

commit 8af7506
Author: dotnet-maestro-bot <[email protected]>
Date:   Wed Feb 7 16:37:37 2018 -0600

    Update BuildTools, WCF to preview2-02507-02, preview2-26207-03, respectively (dotnet#2548)

commit 92329fd
Merge: c8f392e 46e1b2a
Author: Stephen Bonikowsky <[email protected]>
Date:   Wed Feb 7 11:25:05 2018 -0800

    Merge pull request dotnet#2545 from dotnet-maestro-bot/master-UpdateDependencies

    Update BuildTools, ProjectNTfs, ProjectNTfsTestILC, Standard, WCF to preview2-02507-01, beta-26207-00, beta-26207-00, preview1-26206-01, preview2-26207-02, respectively (master)

commit 46e1b2a
Author: dotnet-maestro-bot <[email protected]>
Date:   Wed Feb 7 10:31:14 2018 -0800

    Update BuildTools, ProjectNTfs, ProjectNTfsTestILC, Standard, WCF to preview2-02507-01, beta-26207-00, beta-26207-00, preview1-26206-01, preview2-26207-02, respectively

commit c8f392e
Author: dotnet-maestro-bot <[email protected]>
Date:   Tue Feb 6 11:27:10 2018 -0600

    Update CoreClr, ProjectNTfs, ProjectNTfsTestILC, Standard to preview2-26205-05, beta-26206-00, beta-26206-00, preview1-26205-01, respectively (dotnet#2542)

commit d901b23
Author: dotnet-maestro-bot <[email protected]>
Date:   Mon Feb 5 13:00:57 2018 -0600

    Update CoreClr, WCF to preview2-26205-01, preview2-26205-01, respectively (dotnet#2540)

commit 0a0599f
Author: dotnet-maestro-bot <[email protected]>
Date:   Fri Feb 2 16:07:11 2018 -0600

    Update BuildTools to preview2-02502-01 (dotnet#2538)

commit 8c071a2
Author: dotnet-maestro-bot <[email protected]>
Date:   Fri Feb 2 12:46:09 2018 -0600

    Update CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC, Standard, WCF to preview2-26202-06, preview2-26202-05, beta-26202-01, beta-26202-01, preview1-26202-01, preview2-26202-01, respectively (dotnet#2537)

commit 2df2dc4
Author: dotnet-maestro-bot <[email protected]>
Date:   Thu Feb 1 13:57:40 2018 -0600

    Update CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC, Standard, WCF to preview2-26201-05, preview2-26201-05, beta-26201-00, beta-26201-00, preview1-26201-01, preview2-26201-03, respectively (dotnet#2532)

commit 9962f41
Author: Jose Perez Rodriguez <[email protected]>
Date:   Wed Jan 31 17:18:49 2018 -0800

    Building non-Windows builds using the CLI's MSBuild (dotnet#2533)

    * Building non-Windows builds using the CLI's MSBuild

    * Fixing svcutil issue on non-Windows

commit 4f6966c
Merge: ea293cb 057b39c
Author: Jose Perez Rodriguez <[email protected]>
Date:   Tue Jan 30 16:37:38 2018 -0800

    Merge pull request dotnet#2529 from dotnet-maestro-bot/master-UpdateDependencies

    Update BuildTools, CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC, Standard to prerelease-02430-05, preview2-26130-05, preview2-26130-01, beta-26130-01, beta-26130-01, preview1-26130-01, respectively (master)

commit 057b39c
Author: Jose Perez Rodriguez <[email protected]>
Date:   Tue Jan 30 16:08:25 2018 -0800

    Remove BuildTools update

commit aa6fd39
Author: dotnet-maestro-bot <[email protected]>
Date:   Tue Jan 30 14:52:55 2018 -0800

    Update BuildTools, CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC, Standard to prerelease-02430-05, preview2-26130-05, preview2-26130-01, beta-26130-01, beta-26130-01, preview1-26130-01, respectively

commit ea293cb
Author: dotnet-maestro-bot <[email protected]>
Date:   Mon Jan 29 00:39:45 2018 -0600

    Update CoreClr, ProjectNTfs, ProjectNTfsTestILC to preview2-26129-01, beta-26129-00, beta-26129-00, respectively (dotnet#2528)

commit 3208b17
Author: dotnet-maestro-bot <[email protected]>
Date:   Sun Jan 28 20:28:18 2018 -0600

    Update CoreClr to preview2-26128-04 (dotnet#2527)

commit abc80e8
Author: dotnet-maestro-bot <[email protected]>
Date:   Sat Jan 27 15:04:13 2018 -0600

    Update CoreClr, CoreFx to preview2-26127-04, preview2-26127-04, respectively (dotnet#2526)

commit 9f8a477
Author: dotnet-maestro-bot <[email protected]>
Date:   Fri Jan 26 19:05:49 2018 -0600

    Update BuildTools, CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC, Standard, WCF to prerelease-02427-01, preview2-26126-07, preview2-26126-03, beta-26126-00, beta-26126-00, preview1-26126-01, preview2-26125-02, respectively (dotnet#2520)

commit 54bfcc5
Merge: f708d41 cdc752a
Author: Stephen Bonikowsky <[email protected]>
Date:   Fri Jan 26 15:37:57 2018 -0800

    Merge pull request dotnet#2522 from StephenBonikowsky/stebon/master/HarvestLatestPkgsFrom1.1.0

    Update master branch packaging to harvest latest release of 1.1.0

commit cdc752a
Author: Stephen Bonikowsky <[email protected]>
Date:   Fri Jan 26 14:06:57 2018 -0800

    Update master branch packaging to harvest latest release of 1.1.0

    * This updates the harvested S.P.SM assembly for netcore50 and netstandard1.3 to the most recently released version that was released in package 4.3.1
    * The harvested S.P.SM assembly version should now be 4.1.1.1

commit f708d41
Author: Miguel Lacouture <[email protected]>
Date:   Fri Jan 26 13:46:48 2018 -0800

    Release notes for D15.6 P3 (dotnet#2521)

    Updated reference guide link to point to msdocs

commit 58e0442
Author: Matt Connew <[email protected]>
Date:   Thu Jan 18 15:53:22 2018 -0800

    Fix support for using proxies with HTTP transport

commit d126040
Merge: 7fe534c 23ba90a
Author: Stephen Bonikowsky <[email protected]>
Date:   Thu Jan 25 18:43:20 2018 -0800

    Merge pull request dotnet#2519 from StephenBonikowsky/stebon/master/IncrementAssemblyVersions

    Increment assembly versions to match package versions.

commit 23ba90a
Author: Stephen Bonikowsky <[email protected]>
Date:   Thu Jan 25 10:41:50 2018 -0800

    Increment assembly versions to match package versions.

    * Keep the label as Preview 2.

commit 7fe534c
Merge: 22efd66 9aa6c5c
Author: Stephen Bonikowsky <[email protected]>
Date:   Thu Jan 25 10:23:26 2018 -0800

    Merge pull request dotnet#2517 from dotnet-maestro-bot/master-UpdateDependencies

    Update BuildTools, CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC, Standard, WCF to prerelease-02425-01, preview2-26125-07, preview2-26125-06, beta-26125-00, beta-26125-00, preview1-26125-01, preview2-26125-01, respectively (master)

commit 9aa6c5c
Author: dotnet-maestro-bot <[email protected]>
Date:   Thu Jan 25 09:13:21 2018 -0800

    Update BuildTools, CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC, Standard, WCF to prerelease-02425-01, preview2-26125-07, preview2-26125-06, beta-26125-00, beta-26125-00, preview1-26125-01, preview2-26125-01, respectively

commit 22efd66
Merge: 03606ed 9f0f4e8
Author: Stephen Bonikowsky <[email protected]>
Date:   Wed Jan 24 15:25:05 2018 -0800

    Merge pull request dotnet#2516 from StephenBonikowsky/dev/stebon/AddReportingForBrach2.1.0inMaster

    Enable CI tests for PRs in release/2.1.0

commit 9f0f4e8
Author: Stephen Bonikowsky <[email protected]>
Date:   Wed Jan 24 09:44:04 2018 -0800

    Enable CI tests for PRs in release/2.1.0

commit 03606ed
Merge: d287cfe 1ed5fc9
Author: Stephen Bonikowsky <[email protected]>
Date:   Wed Jan 24 14:07:00 2018 -0800

    Merge pull request dotnet#2514 from dotnet-maestro-bot/master-UpdateDependencies

    Update CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC, Standard to preview2-26124-08, preview2-26124-02, beta-26123-03, beta-26123-03, preview1-26124-01, respectively (master)

commit 1ed5fc9
Author: dotnet-maestro-bot <[email protected]>
Date:   Wed Jan 24 10:56:12 2018 -0800

    Update CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC, Standard to preview2-26124-08, preview2-26124-02, beta-26123-03, beta-26123-03, preview1-26124-01, respectively
  • Loading branch information
@StephenBonikowsky
StephenBonikowsky committed Mar 22, 2018
1 parent e1b5a47 commit b54e61f
Show file tree
Hide file tree
Showing 38 changed files with 730 additions and 165 deletions.
2 changes: 1 addition & 1 deletion BuildToolsVersion.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.0-preview1-02609-02
2.1.0-preview2-02621-01
5 changes: 5 additions & 0 deletions BuildToolsVersion.txt.orig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<<<<<<< HEAD
2.1.0-preview1-02609-02
=======
2.1.0-preview3-02622-01
>>>>>>> master
49 changes: 0 additions & 49 deletions Documentation/WCF-Web-Service-Reference-guide.md
View file

This file was deleted.

2 changes: 1 addition & 1 deletion DotnetCLIVersion.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0-preview1-005977
2.1.2
236 changes: 236 additions & 0 deletions dependencies.props.orig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,236 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->

<!-- For detailed explanation of the reference versions see:

https://github.com/dotnet/buildtools/blob/master/Documentation/project-nuget-dependencies.md
https://github.com/dotnet/buildtools/blob/master/Documentation/annotated-dependency-props.md

These ref versions are pulled from https://github.com/dotnet/versions.
-->
<PropertyGroup>
<<<<<<< HEAD
<CoreFxCurrentRef>39ff9d67dee0e90452f4c23a7c9edf5b74cf1ff1</CoreFxCurrentRef>
<WCFCurrentRef>5aba8cba6e8ca210ff0b7ae9d54fcda40a719de4</WCFCurrentRef>
<StandardCurrentRef>6298244e25cf84d91e3cda9627315f2425274624</StandardCurrentRef>
<ProjectNTfsCurrentRef>65f2e19b242b2d5ba1a3b058d01130cef8e8c045</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>65f2e19b242b2d5ba1a3b058d01130cef8e8c045</ProjectNTfsTestILCCurrentRef>
<BuildToolsCurrentRef>39ff9d67dee0e90452f4c23a7c9edf5b74cf1ff1</BuildToolsCurrentRef>
<CoreClrCurrentRef>39ff9d67dee0e90452f4c23a7c9edf5b74cf1ff1</CoreClrCurrentRef>
=======
<CoreFxCurrentRef>7a677997e3bdfdffdbd9c210134db1eb80f0d959</CoreFxCurrentRef>
<WCFCurrentRef>7a677997e3bdfdffdbd9c210134db1eb80f0d959</WCFCurrentRef>
<StandardCurrentRef>7a677997e3bdfdffdbd9c210134db1eb80f0d959</StandardCurrentRef>
<ProjectNTfsCurrentRef>6228d26347a4a79652347621b1d2a493f3ed9065</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>6228d26347a4a79652347621b1d2a493f3ed9065</ProjectNTfsTestILCCurrentRef>
<BuildToolsCurrentRef>7a677997e3bdfdffdbd9c210134db1eb80f0d959</BuildToolsCurrentRef>
<CoreClrCurrentRef>7a677997e3bdfdffdbd9c210134db1eb80f0d959</CoreClrCurrentRef>
>>>>>>> master
</PropertyGroup>

<!-- Auto-upgraded properties for each build info dependency. -->
<PropertyGroup>
<<<<<<< HEAD
<WCFExpectedPrerelease>preview1-26316-01</WCFExpectedPrerelease>
<CoreFxExpectedPrerelease>preview1-26216-02</CoreFxExpectedPrerelease>
<NETStandardPackageVersion>2.0.1</NETStandardPackageVersion>
=======
<WCFExpectedPrerelease>preview2-26322-01</WCFExpectedPrerelease>
<CoreFxExpectedPrerelease>preview3-26322-06</CoreFxExpectedPrerelease>
<NETStandardPackageVersion>2.1.0-preview1-26322-01</NETStandardPackageVersion>
>>>>>>> master
<NETStandardPackageId>NETStandard.Library</NETStandardPackageId>
<!--
This property is used for many CoreFX packages, because they have the same
versions. Make more properties for CoreFX if split versions are required.
-->
<<<<<<< HEAD
<MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.5.0-preview1-26216-02</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
<MicrosoftPrivateCoreFxUAPPackageVersion>4.6.0-preview1-26216-02</MicrosoftPrivateCoreFxUAPPackageVersion>
=======
<MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.5.0-preview3-26322-06</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
<MicrosoftPrivateCoreFxUAPPackageVersion>4.6.0-preview2-26202-05</MicrosoftPrivateCoreFxUAPPackageVersion>
>>>>>>> master

<ProjectNTfsExpectedPrerelease>beta-26226-00</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-26226-00</ProjectNTfsTestILCExpectedPrerelease>
<ProjectNTfsTestILCPackageVersion>DEPENDENCY 'TestILC.amd64ret' NOT FOUND</ProjectNTfsTestILCPackageVersion>
</PropertyGroup>

<!-- Full package version strings that are used in other parts of the build. -->
<PropertyGroup>
<AppXRunnerVersion>1.0.3-prerelease-00921-01</AppXRunnerVersion>
<CoreFxBaseLinePackageVersion>2.2.0-preview1-26216-02</CoreFxBaseLinePackageVersion>
<XunitPerfAnalysisPackageVersion>1.0.0-beta-build0015</XunitPerfAnalysisPackageVersion>
<XunitNetcoreExtensionsVersion>2.1.0-preview1-02609-02</XunitNetcoreExtensionsVersion>

<<<<<<< HEAD
<CoreClrPackageVersion>2.1.0-preview1-26216-04</CoreClrPackageVersion>
=======
<CoreClrPackageVersion>2.1.0-preview3-26322-06</CoreClrPackageVersion>
>>>>>>> master
<DotNetHostPackageVersion>2.0.0-preview2-25310-02</DotNetHostPackageVersion>

<!-- Microsoft.NETCore.Platforms is part of CoreFX, but allow separate upgrade. -->
<PlatformPackageVersion>2.1.0-preview1-26218-04</PlatformPackageVersion>
</PropertyGroup>

<!-- Package versions used as toolsets -->
<PropertyGroup>
<FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
<<<<<<< HEAD
<FeedTasksPackageVersion>2.1.0-preview1-02609-02</FeedTasksPackageVersion>
=======
<FeedTasksPackageVersion>2.1.0-preview3-02622-01</FeedTasksPackageVersion>
>>>>>>> master
</PropertyGroup>

<!-- Package dependency verification/auto-upgrade configuration. -->
<PropertyGroup>
<BaseDotNetBuildInfo>build-info/dotnet/</BaseDotNetBuildInfo>
<DependencyBranch>release/2.1.0</DependencyBranch>
<CoreDependencyBranch>release/2.1</CoreDependencyBranch>
<CurrentRefXmlPath>$(MSBuildThisFileFullPath)</CurrentRefXmlPath>
</PropertyGroup>

<ItemGroup>
<RemoteDependencyBuildInfo Include="WCF">
<BuildInfoPath>$(BaseDotNetBuildInfo)wcf/$(DependencyBranch)</BuildInfoPath>
<CurrentRef>$(WCFCurrentRef)</CurrentRef>
</RemoteDependencyBuildInfo>
<RemoteDependencyBuildInfo Include="CoreFx">
<BuildInfoPath>$(BaseDotNetBuildInfo)corefx/$(CoreDependencyBranch)</BuildInfoPath>
<CurrentRef>$(CoreFxCurrentRef)</CurrentRef>
<!-- manually pick up a new baseline in order to get package dependencies updated -->
<DisabledPackages>Microsoft.Private.PackageBaseline;NETStandard.Library</DisabledPackages>
</RemoteDependencyBuildInfo>
<RemoteDependencyBuildInfo Include="Standard">
<BuildInfoPath>$(BaseDotNetBuildInfo)standard/release/2.0.0</BuildInfoPath>
<CurrentRef>$(StandardCurrentRef)</CurrentRef>
</RemoteDependencyBuildInfo>
<!--<RemoteDependencyBuildInfo Include="ProjectNTfs">
<BuildInfoPath>$(BaseDotNetBuildInfo)projectn-tfs/$(DependencyBranch)</BuildInfoPath>
<CurrentRef>$(ProjectNTfsCurrentRef)</CurrentRef>
</RemoteDependencyBuildInfo>
<RemoteDependencyBuildInfo Include="ProjectNTfsTestILC">
<BuildInfoPath>$(BaseDotNetBuildInfo)projectn-tfs-testilc/$(DependencyBranch)</BuildInfoPath>
<CurrentRef>$(ProjectNTfsTestILCCurrentRef)</CurrentRef>
</RemoteDependencyBuildInfo>-->
<RemoteDependencyBuildInfo Include="BuildTools">
<BuildInfoPath>$(BaseDotNetBuildInfo)buildtools/$(CoreDependencyBranch)</BuildInfoPath>
<CurrentRef>$(BuildToolsCurrentRef)</CurrentRef>
</RemoteDependencyBuildInfo>
<RemoteDependencyBuildInfo Include="CoreClr">
<BuildInfoPath>$(BaseDotNetBuildInfo)coreclr/$(CoreDependencyBranch)</BuildInfoPath>
<CurrentRef>$(CoreClrCurrentRef)</CurrentRef>
</RemoteDependencyBuildInfo>

<DependencyBuildInfo Include="@(RemoteDependencyBuildInfo)">
<RawVersionsBaseUrl>https://raw.githubusercontent.com/dotnet/versions</RawVersionsBaseUrl>
</DependencyBuildInfo>

<XmlUpdateStep Include="WCF">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>WCFExpectedPrerelease</ElementName>
<BuildInfoName>WCF</BuildInfoName>
</XmlUpdateStep>
<XmlUpdateStep Include="CoreFx">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>CoreFxExpectedPrerelease</ElementName>
<BuildInfoName>CoreFx</BuildInfoName>
</XmlUpdateStep>
<XmlUpdateStep Include="CoreFx">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>MicrosoftPrivateCoreFxNETCoreAppPackageVersion</ElementName>
<PackageId>Microsoft.Private.CoreFx.NETCoreApp</PackageId>
</XmlUpdateStep>
<!--<XmlUpdateStep Include="CoreFx">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>MicrosoftPrivateCoreFxUAPPackageVersion</ElementName>
<PackageId>Microsoft.Private.CoreFx.UAP</PackageId>
</XmlUpdateStep>-->
<XmlUpdateStep Include="Standard">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>NETStandardPackageVersion</ElementName>
<PackageId>$(NETStandardPackageId)</PackageId>
</XmlUpdateStep>
<!--<XmlUpdateStep Include="ProjectNTfs">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>ProjectNTfsExpectedPrerelease</ElementName>
<BuildInfoName>ProjectNTfs</BuildInfoName>
</XmlUpdateStep>
<XmlUpdateStep Include="ProjectNTfsTestILC">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>ProjectNTfsTestILCExpectedPrerelease</ElementName>
<BuildInfoName>ProjectNTfsTestILC</BuildInfoName>
</XmlUpdateStep>
<XmlUpdateStep Include="ProjectNTfsTestILC">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>ProjectNTfsTestILCPackageVersion</ElementName>
<PackageId>TestILC.amd64ret</PackageId>
</XmlUpdateStep>-->
<UpdateStep Include="BuildTools">
<UpdaterType>File</UpdaterType>
<Path>$(MSBuildThisFileDirectory)BuildToolsVersion.txt</Path>
<PackageId>Microsoft.DotNet.BuildTools</PackageId>
</UpdateStep>
<XmlUpdateStep Include="BuildTools">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>XunitNetcoreExtensionsVersion</ElementName>
<PackageId>Microsoft.xunit.netcore.extensions</PackageId>
</XmlUpdateStep>
<XmlUpdateStep Include="BuildTools">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>FeedTasksPackageVersion</ElementName>
<PackageId>$(FeedTasksPackage)</PackageId>
</XmlUpdateStep>
<XmlUpdateStep Include="CoreClr">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>CoreClrPackageVersion</ElementName>
<PackageId>Microsoft.NETCore.Runtime.CoreCLR</PackageId>
</XmlUpdateStep>
</ItemGroup>

<PropertyGroup>
<XUnitPackageVersion>2.3.0-beta1-build3642</XUnitPackageVersion>
</PropertyGroup>

<!-- Set up dependencies on packages that aren't found in a BuildInfo. -->
<ItemGroup>
<TargetingPackDependency Include="Microsoft.TargetingPack.NETFramework.v4.5" />
<TargetingPackDependency Include="Microsoft.TargetingPack.NETFramework.v4.5.1" />
<TargetingPackDependency Include="Microsoft.TargetingPack.NETFramework.v4.5.2" />
<TargetingPackDependency Include="Microsoft.TargetingPack.NETFramework.v4.6" />
<TargetingPackDependency Include="Microsoft.TargetingPack.NETFramework.v4.6.1" />
<TargetingPackDependency Include="Microsoft.TargetingPack.NETFramework.v4.6.2" />
<StaticDependency Include="@(TargetingPackDependency)">
<Version>1.0.1</Version>
</StaticDependency>

<StaticDependency Include="Microsoft.TargetingPack.Private.WinRT">
<Version>1.0.3</Version>
</StaticDependency>

<XUnitDependency Include="xunit"/>
<XUnitDependency Include="xunit.runner.utility"/>
<XUnitDependency Include="xunit.runner.console"/>
<StaticDependency Include="@(XUnitDependency)">
<Version>$(XUnitPackageVersion)</Version>
</StaticDependency>

<StaticDependency Include="Microsoft.xunit.netcore.extensions;Microsoft.DotNet.BuildTools.TestSuite">
<Version>$(XunitNetcoreExtensionsVersion)</Version>
</StaticDependency>

<DependencyBuildInfo Include="@(StaticDependency)">
<PackageId>%(Identity)</PackageId>
<UpdateStableVersions>true</UpdateStableVersions>
</DependencyBuildInfo>

<DependencyBuildInfo Include="uwpRunnerVersion">
<PackageId>microsoft.xunit.runner.uwp</PackageId>
<Version>$(AppXRunnerVersion)</Version>
</DependencyBuildInfo>

</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion dir.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<!-- Define vNext UAP Moniker -->
<PropertyGroup>
<UAPvNextVersion>10.0.15138</UAPvNextVersion>
<UAPvNextVersion>10.0.16300</UAPvNextVersion>
<UAPvNextTFMFull>UAP,Version=v$(UAPvNextVersion)</UAPvNextTFMFull>
<UAPvNextTFM>uap$(UAPvNextVersion)</UAPvNextTFM>
</PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions external/runtime/runtime.depproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<NugetRuntimeIdentifier Condition="'$(TargetGroup)' == 'uap'">win10-$(ArchGroup)</NugetRuntimeIdentifier>
<NugetRuntimeIdentifier Condition="'$(TargetGroup)' == 'uapaot'">win10-$(ArchGroup)-aot</NugetRuntimeIdentifier>
<RidSpecificAssets>true</RidSpecificAssets>
<NoWarn>$(NoWarn);NU1603;NU1605</NoWarn>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetGroup)' == 'uapaot'">
Expand Down
1 change: 1 addition & 0 deletions external/test-runtime/XUnit.Runtime.depproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<NuGetTargetMonikerShort Condition="'$(TargetGroup)' == 'uapaot'">netstandard2.0</NuGetTargetMonikerShort>
<NuGetTargetMoniker Condition="'$(TargetGroup)' == 'uap'">.NETStandard,Version=v2.0</NuGetTargetMoniker>
<NuGetTargetMonikerShort Condition="'$(TargetGroup)' == 'uap'">netstandard2.0</NuGetTargetMonikerShort>
<NoWarn>$(NoWarn);NU1603</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit.console.netcore">
Expand Down
4 changes: 2 additions & 2 deletions init-tools.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ if exist "%DOTNET_CMD%" goto :afterdotnetrestore

echo Installing dotnet cli...
if NOT exist "%DOTNET_PATH%" mkdir "%DOTNET_PATH%"
set DOTNET_ZIP_NAME=dotnet-dev-win-x64.%DOTNET_VERSION%.zip
set DOTNET_ZIP_NAME=dotnet-sdk-%DOTNET_VERSION%-win-x64.zip
set DOTNET_REMOTE_PATH=https://dotnetcli.azureedge.net/dotnet/Sdk/%DOTNET_VERSION%/%DOTNET_ZIP_NAME%
set DOTNET_LOCAL_PATH=%DOTNET_PATH%%DOTNET_ZIP_NAME%
echo Installing '%DOTNET_REMOTE_PATH%' to '%DOTNET_LOCAL_PATH%' >> "%INIT_TOOLS_LOG%"
Expand Down Expand Up @@ -68,4 +68,4 @@ if not [%INIT_TOOLS_ERRORLEVEL%]==[0] (
:: Create sempahore file
echo Done initializing tools.
echo Init-Tools.cmd completed for BuildTools Version: %BUILDTOOLS_VERSION% > "%BUILD_TOOLS_SEMAPHORE%"
exit /b 0
exit /b 0
Loading

0 comments on commit b54e61f

Please sign in to comment.