diff --git a/.azure-pipelines/mgmt.yml b/.azure-pipelines/mgmt.yml index cab0ade481c87..49170d35bad16 100644 --- a/.azure-pipelines/mgmt.yml +++ b/.azure-pipelines/mgmt.yml @@ -21,11 +21,12 @@ jobs: LoggingArgs: '/flp:Summary;Verbosity=minimal;LogFile=msbuild.sum /flp1:warningsonly;logfile=msbuild.wrn /flp2:errorsonly;logfile=msbuild.err' steps: - - task: CmdLine@1 - inputs: - filename: C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.2 Tools\sn.exe - arguments: -Vr *,31bf3856ad364e35 - displayName: 'Disable strong name verification' + # - task: CmdLine@1 + # inputs: + # filename: C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.2 Tools\sn.exe + # arguments: -Vr *,31bf3856ad364e35 + # displayName: 'Disable strong name verification' + - task: MSBuild@1 inputs: solution: build.proj @@ -33,7 +34,7 @@ jobs: - task: MSBuild@1 inputs: solution: build.proj - msbuildArguments: /t:RunTests /clp:ShowTimestamp $(LoggingArgs) /p:IgnorePathTokens="$(IgnoreBuildTokens)" + msbuildArguments: /t:RunTests /clp:ShowTimestamp $(LoggingArgs) /p:IgnorePathTokens="$(IgnoreBuildTokens)" /p:UseLegacyDirStructure=true /p:SkipTests=true displayName: 'Build and Run tests' - task: PublishTestResults@2 condition: succeededOrFailed() @@ -52,8 +53,13 @@ jobs: displayName: 'Use .NET Core sdk $(DotNetCoreVersion)' inputs: version: '$(DotNetCoreVersion)' - - script: './tools/linuxScripts/runNetCoreSdkTests.sh' - displayName: 'Build and test on Non-windows machine' + + - task: DotNetCoreCLI@1 + inputs: + command: msbuild + solution: build.proj + arguments: /t:RunTests /clp:ShowTimestamp $(LoggingArgs) /p:IgnorePathTokens="$(IgnoreBuildTokens)" /p:UseLegacyDirStructure=true /p:SkipTests=true + displayName: 'Ubuntu Build and Run tests' - task: PublishTestResults@2 condition: succeededOrFailed() inputs: @@ -61,3 +67,22 @@ jobs: testRunTitle: 'Ubuntu Test Results' testResultsFormat: 'VSTest' mergeTestResults: true + + # - job: Ubuntu_Build + # pool: + # vmImage: 'ubuntu-16.04' + + # steps: + # - task: DotNetCoreInstaller@0 + # displayName: 'Use .NET Core sdk $(DotNetCoreVersion)' + # inputs: + # version: '$(DotNetCoreVersion)' + # - script: './tools/linuxScripts/runNetCoreSdkTests.sh' + # displayName: 'Build and test on Non-windows machine' + # - task: PublishTestResults@2 + # condition: succeededOrFailed() + # inputs: + # testResultsFiles: '**/*.trx' + # testRunTitle: 'Ubuntu Test Results' + # testResultsFormat: 'VSTest' + # mergeTestResults: true diff --git a/.gitignore b/.gitignore index 6544692bd0871..f91c984938f21 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ tools/Microsoft.WindowsAzure.Build.Tasks/packages/ PublishedNugets/ src/NuGet.Config tools/7-zip/ +#tools/LocalNugetFeed/Microsoft.Internal.NetSdkBuild.Mgmt.Tools.*.nupkg [Tt]est[Rr]esult [Bb]uild[Ll]og.* diff --git a/AzSdk.props b/AzSdk.props deleted file mode 100644 index 8e9d510c354b0..0000000000000 --- a/AzSdk.props +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 1427c832cafbe..817cde1c50367 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,12 +2,13 @@ $(MSBuildThisFileDirectory) $(MSBuildThisFileDirectory)eng - $(RepoRoot)src/SDKs + $(RepoRoot)src + $(RepoRoot)src/SDKs true true true - + diff --git a/Directory.Build.targets b/Directory.Build.targets index 1ac067db05054..6683cc48d2e5a 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/NuGet.Config b/NuGet.Config index b7d30939f64a9..7254bc10808fe 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -6,4 +6,16 @@ - \ No newline at end of file + + + + + + + + + + + + + diff --git a/build.proj b/build.proj index 31c962f8b14b8..a5b747270aa74 100644 --- a/build.proj +++ b/build.proj @@ -1,7 +1,4 @@ - - - \ No newline at end of file diff --git a/eng/AzSdk.reference.targets b/eng/AzSdk.reference.targets deleted file mode 100644 index 0f92232ad5bab..0000000000000 --- a/eng/AzSdk.reference.targets +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/eng/AzSdk.test.reference.targets b/eng/AzSdk.test.reference.targets deleted file mode 100644 index 75979ebb51056..0000000000000 --- a/eng/AzSdk.test.reference.targets +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/eng/Directory.Build.Mgmt.props b/eng/Directory.Build.Mgmt.props deleted file mode 100644 index 00690a36e2a59..0000000000000 --- a/eng/Directory.Build.Mgmt.props +++ /dev/null @@ -1,33 +0,0 @@ - - - $(RepoRoot) - $(LibraryRoot)\tools - $(LibraryToolsFolder)\BuildAssets - $(LibraryToolsFolder)\SdkBuildTools - - - - $(BuildAssetsDir)\targets - $(SdkBuildToolsDir)\targets - $(BuildAssetsDir) - $(SdkBuildToolsDir) - - - - - $(DefaultPathTokenToIgnore) Microsoft.Rest.ClientRuntime.Tracing.Tests - $(DefaultPathTokenToIgnore) Microsoft.Azure.Services.AppAuthentication.IntegrationTests - $(DefaultPathTokenToIgnore) Batch\DataPlane - $(DefaultPathTokenToIgnore) Batch\Support - $(DefaultPathTokenToIgnore) LocationBasedServices - $(DefaultPathTokenToIgnore) BotService - $(DefaultPathTokenToIgnore) TestFramework\TestFramework.Net45Tests - - - - - $(DefaultPathTokenToIgnore) data-plane - - - - diff --git a/eng/Directory.Build.Mgmt.targets b/eng/Directory.Build.Mgmt.targets deleted file mode 100644 index 7dd44f7e61322..0000000000000 --- a/eng/Directory.Build.Mgmt.targets +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/eng/mgmt/AzSdk.reference.props b/eng/mgmt/AzSdk.reference.props new file mode 100644 index 0000000000000..fd00801bdaa19 --- /dev/null +++ b/eng/mgmt/AzSdk.reference.props @@ -0,0 +1,40 @@ + + + true + + + + + + + + + net452;net461;netstandard1.4;netstandard2.0 + + + + + + + + + + + + + + + + + + + + + + + + true + true + + + \ No newline at end of file diff --git a/eng/mgmt/AzSdk.test.reference.props b/eng/mgmt/AzSdk.test.reference.props new file mode 100644 index 0000000000000..86a0d1a4bc29d --- /dev/null +++ b/eng/mgmt/AzSdk.test.reference.props @@ -0,0 +1,15 @@ + + + netcoreapp2.0 + + + + + + + + + + + + diff --git a/eng/mgmt/Directory.Build.Mgmt.props b/eng/mgmt/Directory.Build.Mgmt.props new file mode 100644 index 0000000000000..b34a7617fef26 --- /dev/null +++ b/eng/mgmt/Directory.Build.Mgmt.props @@ -0,0 +1,4 @@ + + + + diff --git a/eng/mgmt/Directory.Build.Mgmt.targets b/eng/mgmt/Directory.Build.Mgmt.targets new file mode 100644 index 0000000000000..5abccc6a4f38e --- /dev/null +++ b/eng/mgmt/Directory.Build.Mgmt.targets @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/sdk/keyvault/Microsoft.Azure.KeyVault.WebKey/src/Microsoft.Azure.KeyVault.WebKey.csproj b/sdk/keyvault/Microsoft.Azure.KeyVault.WebKey/src/Microsoft.Azure.KeyVault.WebKey.csproj index 8f6f7732eed7d..83fb15dcb080a 100644 --- a/sdk/keyvault/Microsoft.Azure.KeyVault.WebKey/src/Microsoft.Azure.KeyVault.WebKey.csproj +++ b/sdk/keyvault/Microsoft.Azure.KeyVault.WebKey/src/Microsoft.Azure.KeyVault.WebKey.csproj @@ -1,5 +1,4 @@  - Microsoft Azure Key Vault WebKey Class Library Microsoft Azure Key Vault WebKey diff --git a/src/AzSdk.reference.props b/src/AzSdk.reference.props index ed4392a210604..fd00801bdaa19 100644 --- a/src/AzSdk.reference.props +++ b/src/AzSdk.reference.props @@ -1,8 +1,11 @@ - + + true + + @@ -33,4 +36,5 @@ true true + \ No newline at end of file diff --git a/src/AzSdk.test.reference.props b/src/AzSdk.test.reference.props index 9068158fe0bd0..86a0d1a4bc29d 100644 --- a/src/AzSdk.test.reference.props +++ b/src/AzSdk.test.reference.props @@ -1,6 +1,4 @@ - - - + netcoreapp2.0 @@ -8,8 +6,10 @@ - - - + + + + + diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/Fabric.Tests.csproj b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/Fabric.Tests.csproj index adc15bc55d007..a11571ad2c06c 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/Fabric.Tests.csproj +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin.Tests/Fabric.Tests.csproj @@ -8,7 +8,10 @@ 1.0.0 true - + + true + true + diff --git a/src/SDKs/ApplicationInsights/Management/ApplicationInsights.Tests/ApplicationInsights.Tests.csproj b/src/SDKs/ApplicationInsights/Management/ApplicationInsights.Tests/ApplicationInsights.Tests.csproj index f4e9b79d72f27..b3fec56409d33 100644 --- a/src/SDKs/ApplicationInsights/Management/ApplicationInsights.Tests/ApplicationInsights.Tests.csproj +++ b/src/SDKs/ApplicationInsights/Management/ApplicationInsights.Tests/ApplicationInsights.Tests.csproj @@ -7,6 +7,10 @@ 1.0.0-preview true + + true + true + diff --git a/src/SDKs/Batch/Management/Management.Batch.Tests/Management.Batch.Tests.csproj b/src/SDKs/Batch/Management/Management.Batch.Tests/Management.Batch.Tests.csproj index 2477a0d61a201..c9102968582ea 100644 --- a/src/SDKs/Batch/Management/Management.Batch.Tests/Management.Batch.Tests.csproj +++ b/src/SDKs/Batch/Management/Management.Batch.Tests/Management.Batch.Tests.csproj @@ -14,6 +14,10 @@ Copyright © MSIT 2013 false + + true + true + diff --git a/src/SDKs/Billing/Billing.Tests/Billing.Tests.csproj b/src/SDKs/Billing/Billing.Tests/Billing.Tests.csproj index f323488da0e29..f0c1ffc4b5439 100644 --- a/src/SDKs/Billing/Billing.Tests/Billing.Tests.csproj +++ b/src/SDKs/Billing/Billing.Tests/Billing.Tests.csproj @@ -8,6 +8,10 @@ 1.0.0 true + + true + true + diff --git a/src/SDKs/Compute/Compute.Tests/Compute.Tests.csproj b/src/SDKs/Compute/Compute.Tests/Compute.Tests.csproj index f3fbf3f2dd560..aa72e7564b0d5 100644 --- a/src/SDKs/Compute/Compute.Tests/Compute.Tests.csproj +++ b/src/SDKs/Compute/Compute.Tests/Compute.Tests.csproj @@ -6,7 +6,10 @@ Compute.Tests 1.0.0-preview - + + true + true + diff --git a/src/SDKs/Consumption/Consumption.Tests/Consumption.Tests.csproj b/src/SDKs/Consumption/Consumption.Tests/Consumption.Tests.csproj index e5fc3c84ddde4..66eb0f01c6c04 100644 --- a/src/SDKs/Consumption/Consumption.Tests/Consumption.Tests.csproj +++ b/src/SDKs/Consumption/Consumption.Tests/Consumption.Tests.csproj @@ -7,6 +7,10 @@ 1.0.0 true + + true + true + diff --git a/src/SDKs/Consumption/Consumption.Tests/ScenarioTests/ReservationDetailsTests.cs b/src/SDKs/Consumption/Consumption.Tests/ScenarioTests/ReservationDetailsTests.cs index e2fe193551d88..1e19c23b5b890 100644 --- a/src/SDKs/Consumption/Consumption.Tests/ScenarioTests/ReservationDetailsTests.cs +++ b/src/SDKs/Consumption/Consumption.Tests/ScenarioTests/ReservationDetailsTests.cs @@ -53,7 +53,7 @@ public void ListReservationDetailsWithReservationOrderIdAndReservationIdTest() } } } - private static void ValidateProperties(ReservationDetails item) + private static void ValidateProperties(ReservationDetail item) { Assert.NotNull(item); Assert.NotNull(item.Id); diff --git a/src/SDKs/Consumption/Consumption.Tests/ScenarioTests/ReservationSummariesTests.cs b/src/SDKs/Consumption/Consumption.Tests/ScenarioTests/ReservationSummariesTests.cs index 7077cecff8591..97449ebae95dd 100644 --- a/src/SDKs/Consumption/Consumption.Tests/ScenarioTests/ReservationSummariesTests.cs +++ b/src/SDKs/Consumption/Consumption.Tests/ScenarioTests/ReservationSummariesTests.cs @@ -91,7 +91,7 @@ public void ListReservationSummariesDailyWithReservationOrderIdAndReservationIdT } } - private static void ValidateProperties(ReservationSummaries item) + private static void ValidateProperties(ReservationSummary item) { Assert.NotNull(item); Assert.NotNull(item.Id); diff --git a/src/SDKs/ContainerRegistry/ContainerRegistry.Tests/ContainerRegistry.Tests.csproj b/src/SDKs/ContainerRegistry/ContainerRegistry.Tests/ContainerRegistry.Tests.csproj index ffa28e87a4b73..fbaf54c67f081 100644 --- a/src/SDKs/ContainerRegistry/ContainerRegistry.Tests/ContainerRegistry.Tests.csproj +++ b/src/SDKs/ContainerRegistry/ContainerRegistry.Tests/ContainerRegistry.Tests.csproj @@ -7,7 +7,10 @@ 1.0.0 true - + + true + true + diff --git a/src/SDKs/DataLake.Store/DataLakeStore.Tests/DataLakeStore.Tests.csproj b/src/SDKs/DataLake.Store/DataLakeStore.Tests/DataLakeStore.Tests.csproj index 6412e7d54a0af..56f4ee1632a5a 100644 --- a/src/SDKs/DataLake.Store/DataLakeStore.Tests/DataLakeStore.Tests.csproj +++ b/src/SDKs/DataLake.Store/DataLakeStore.Tests/DataLakeStore.Tests.csproj @@ -7,6 +7,10 @@ 1.0.0 true + + true + true + diff --git a/src/SDKs/DataLake.Store/Management.DataLake.Store/Microsoft.Azure.Management.DataLake.Store.csproj b/src/SDKs/DataLake.Store/Management.DataLake.Store/Microsoft.Azure.Management.DataLake.Store.csproj index d2a690ee9079f..994c285d37fac 100644 --- a/src/SDKs/DataLake.Store/Management.DataLake.Store/Microsoft.Azure.Management.DataLake.Store.csproj +++ b/src/SDKs/DataLake.Store/Management.DataLake.Store/Microsoft.Azure.Management.DataLake.Store.csproj @@ -14,6 +14,9 @@ $(SdkTargetFx) + + true + diff --git a/src/SDKs/Graph.RBAC/Graph.RBAC.Tests/Tests/GraphTestBase.cs b/src/SDKs/Graph.RBAC/Graph.RBAC.Tests/Tests/GraphTestBase.cs index 2a8120b0f4b43..0a476d9adcb96 100644 --- a/src/SDKs/Graph.RBAC/Graph.RBAC.Tests/Tests/GraphTestBase.cs +++ b/src/SDKs/Graph.RBAC/Graph.RBAC.Tests/Tests/GraphTestBase.cs @@ -239,7 +239,7 @@ public ServicePrincipal CreateServicePrincipal(MockContext context, string appId { var parameters = new ServicePrincipalCreateParameters { - AccountEnabled = bool.TrueString, + AccountEnabled = true, AppId = appId }; diff --git a/src/SDKs/IotHub/IotHub.Tests/IotHub.Tests.csproj b/src/SDKs/IotHub/IotHub.Tests/IotHub.Tests.csproj index 79e939ce03dd1..1197f52224eb3 100644 --- a/src/SDKs/IotHub/IotHub.Tests/IotHub.Tests.csproj +++ b/src/SDKs/IotHub/IotHub.Tests/IotHub.Tests.csproj @@ -7,7 +7,10 @@ 1.0.0 true - + + true + true + diff --git a/src/SDKs/LocationBasedServices/Management.LocationBasedServices/Microsoft.Azure.Management.LocationBasedServices.csproj b/src/SDKs/LocationBasedServices/Management.LocationBasedServices/Microsoft.Azure.Management.LocationBasedServices.csproj index e36ab6eb6ed08..cad371c6638b5 100644 --- a/src/SDKs/LocationBasedServices/Management.LocationBasedServices/Microsoft.Azure.Management.LocationBasedServices.csproj +++ b/src/SDKs/LocationBasedServices/Management.LocationBasedServices/Microsoft.Azure.Management.LocationBasedServices.csproj @@ -23,7 +23,10 @@ $(SdkTargetFx) - + + true + true + diff --git a/src/SDKs/Monitor/Monitor.Tests/Monitor.Tests.csproj b/src/SDKs/Monitor/Monitor.Tests/Monitor.Tests.csproj index 796ab57126672..98817093c0f0c 100644 --- a/src/SDKs/Monitor/Monitor.Tests/Monitor.Tests.csproj +++ b/src/SDKs/Monitor/Monitor.Tests/Monitor.Tests.csproj @@ -7,7 +7,10 @@ 1.0.0 true - + + true + true + diff --git a/src/SDKs/NetApp/NetApp.Tests/NetApp.Tests.csproj b/src/SDKs/NetApp/NetApp.Tests/NetApp.Tests.csproj index 622b8c7a10c6c..7bab91cb74e20 100644 --- a/src/SDKs/NetApp/NetApp.Tests/NetApp.Tests.csproj +++ b/src/SDKs/NetApp/NetApp.Tests/NetApp.Tests.csproj @@ -7,7 +7,10 @@ 1.0.0 true - + + true + true + diff --git a/src/SDKs/OperationalInsights/Management/OperationalInsights.Test/OperationalInsights.Test.csproj b/src/SDKs/OperationalInsights/Management/OperationalInsights.Test/OperationalInsights.Test.csproj index 81a3a86afa5d6..309e5d7a923d7 100644 --- a/src/SDKs/OperationalInsights/Management/OperationalInsights.Test/OperationalInsights.Test.csproj +++ b/src/SDKs/OperationalInsights/Management/OperationalInsights.Test/OperationalInsights.Test.csproj @@ -7,7 +7,10 @@ 1.0.0 true - + + true + true + diff --git a/src/SDKs/Reservations/Reservations.Tests/Reservations.Tests.csproj b/src/SDKs/Reservations/Reservations.Tests/Reservations.Tests.csproj index 04abc781fef62..2bdce83553de4 100644 --- a/src/SDKs/Reservations/Reservations.Tests/Reservations.Tests.csproj +++ b/src/SDKs/Reservations/Reservations.Tests/Reservations.Tests.csproj @@ -8,7 +8,10 @@ 1.0.0 true - + + true + true + diff --git a/src/SDKs/Search/DataPlane/Microsoft.Azure.Search.Data/Microsoft.Azure.Search.Data.csproj b/src/SDKs/Search/DataPlane/Microsoft.Azure.Search.Data/Microsoft.Azure.Search.Data.csproj index b5f1b45eaf537..14037d2ecd463 100644 --- a/src/SDKs/Search/DataPlane/Microsoft.Azure.Search.Data/Microsoft.Azure.Search.Data.csproj +++ b/src/SDKs/Search/DataPlane/Microsoft.Azure.Search.Data/Microsoft.Azure.Search.Data.csproj @@ -14,7 +14,7 @@ true true - $(LibraryToolsFolder)\MSSharedLibKey.snk + $(RepoEngPath)\MSSharedLibKey.snk diff --git a/src/SDKs/Search/DataPlane/Search.Tests/Search.Tests.csproj b/src/SDKs/Search/DataPlane/Search.Tests/Search.Tests.csproj index e12b6c989236f..b7722891bb483 100644 --- a/src/SDKs/Search/DataPlane/Search.Tests/Search.Tests.csproj +++ b/src/SDKs/Search/DataPlane/Search.Tests/Search.Tests.csproj @@ -7,6 +7,10 @@ 1.0.0 true + + true + true + diff --git a/src/SDKs/SecurityCenter/SecurityCenter.Tests/SecurityCenter.Tests.csproj b/src/SDKs/SecurityCenter/SecurityCenter.Tests/SecurityCenter.Tests.csproj index d421ceda96b6f..e937e2ccc17e4 100644 --- a/src/SDKs/SecurityCenter/SecurityCenter.Tests/SecurityCenter.Tests.csproj +++ b/src/SDKs/SecurityCenter/SecurityCenter.Tests/SecurityCenter.Tests.csproj @@ -7,6 +7,10 @@ 1.0.0 true + + true + true + diff --git a/src/SDKs/Subscription/Subscription.Tests/Subscription.FullDesktop.Tests/Subscription.FullDesktop.Tests.csproj b/src/SDKs/Subscription/Subscription.Tests/Subscription.FullDesktop.Tests/Subscription.FullDesktop.Tests.csproj index b92da7b4aef03..4aac6b0c5a7d5 100644 --- a/src/SDKs/Subscription/Subscription.Tests/Subscription.FullDesktop.Tests/Subscription.FullDesktop.Tests.csproj +++ b/src/SDKs/Subscription/Subscription.Tests/Subscription.FullDesktop.Tests/Subscription.FullDesktop.Tests.csproj @@ -7,7 +7,10 @@ FullDesktop.Tests 1.0.0-preview - + + true + true + diff --git a/src/SDKs/Subscription/Subscription.Tests/Subscription.NetCore.Tests/Subscription.Netcore.Tests.csproj b/src/SDKs/Subscription/Subscription.Tests/Subscription.NetCore.Tests/Subscription.Netcore.Tests.csproj index 479eea085e4cf..6a290014c0d1f 100644 --- a/src/SDKs/Subscription/Subscription.Tests/Subscription.NetCore.Tests/Subscription.Netcore.Tests.csproj +++ b/src/SDKs/Subscription/Subscription.Tests/Subscription.NetCore.Tests/Subscription.Netcore.Tests.csproj @@ -7,7 +7,10 @@ 1.0.0 true - + + true + true + diff --git a/src/SDKs/WebSites/WebSites.Tests/WebSites.Tests.csproj b/src/SDKs/WebSites/WebSites.Tests/WebSites.Tests.csproj index df788c883d736..10ef24052b760 100644 --- a/src/SDKs/WebSites/WebSites.Tests/WebSites.Tests.csproj +++ b/src/SDKs/WebSites/WebSites.Tests/WebSites.Tests.csproj @@ -6,9 +6,10 @@ WebSites.Tests 1.0.0-preview - + + true + true + diff --git a/src/SdkCommon/AppAuthentication/Azure.Services.AppAuthentication.IntegrationTests/Microsoft.Azure.Services.AppAuthentication.IntegrationTests.csproj b/src/SdkCommon/AppAuthentication/Azure.Services.AppAuthentication.IntegrationTests/Microsoft.Azure.Services.AppAuthentication.IntegrationTests.csproj index 28c33697d2e75..fc77e11cce047 100644 --- a/src/SdkCommon/AppAuthentication/Azure.Services.AppAuthentication.IntegrationTests/Microsoft.Azure.Services.AppAuthentication.IntegrationTests.csproj +++ b/src/SdkCommon/AppAuthentication/Azure.Services.AppAuthentication.IntegrationTests/Microsoft.Azure.Services.AppAuthentication.IntegrationTests.csproj @@ -4,10 +4,14 @@ net472;net452;net461;netcoreapp2.0;netcoreapp1.1 - net472;FullNetFx - bin\$(Configuration)\ - bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml + net472;FullNetFx + bin\$(Configuration)\ + bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml + + + true + diff --git a/src/SdkCommon/Auth/Az.Auth/Az.Auth.Tests/Az.Auth.Net452.Test/Az.Auth.Net452.Test.csproj b/src/SdkCommon/Auth/Az.Auth/Az.Auth.Tests/Az.Auth.Net452.Test/Az.Auth.Net452.Test.csproj index 1540bafcfbf11..601b6f9c0ee7e 100644 --- a/src/SdkCommon/Auth/Az.Auth/Az.Auth.Tests/Az.Auth.Net452.Test/Az.Auth.Net452.Test.csproj +++ b/src/SdkCommon/Auth/Az.Auth/Az.Auth.Tests/Az.Auth.Net452.Test/Az.Auth.Net452.Test.csproj @@ -10,6 +10,10 @@ net452 + + true + true + diff --git a/src/SdkCommon/Auth/Az.Auth/Az.Auth.Tests/Az.Auth.NetCore.Test/Az.Auth.NetCore.Test.csproj b/src/SdkCommon/Auth/Az.Auth/Az.Auth.Tests/Az.Auth.NetCore.Test/Az.Auth.NetCore.Test.csproj index f9688778983fc..35aa0f62c588d 100644 --- a/src/SdkCommon/Auth/Az.Auth/Az.Auth.Tests/Az.Auth.NetCore.Test/Az.Auth.NetCore.Test.csproj +++ b/src/SdkCommon/Auth/Az.Auth/Az.Auth.Tests/Az.Auth.NetCore.Test/Az.Auth.NetCore.Test.csproj @@ -10,7 +10,10 @@ netcoreapp2.0 - + + true + true + diff --git a/src/SdkCommon/Auth/Az.Auth/Az.Auth.Tests/FullDesktop.Tests/Az.Auth.FullDesktop.Test.csproj b/src/SdkCommon/Auth/Az.Auth/Az.Auth.Tests/FullDesktop.Tests/Az.Auth.FullDesktop.Test.csproj index 788994feaf949..cdfce3fbb98be 100644 --- a/src/SdkCommon/Auth/Az.Auth/Az.Auth.Tests/FullDesktop.Tests/Az.Auth.FullDesktop.Test.csproj +++ b/src/SdkCommon/Auth/Az.Auth/Az.Auth.Tests/FullDesktop.Tests/Az.Auth.FullDesktop.Test.csproj @@ -10,7 +10,10 @@ net461 - + + true + true + diff --git a/src/SdkCommon/CR.test.reference.props b/src/SdkCommon/CR.test.reference.props index 6180adc22cfae..af65843769c85 100644 --- a/src/SdkCommon/CR.test.reference.props +++ b/src/SdkCommon/CR.test.reference.props @@ -1,7 +1,11 @@ - + + + + + \ No newline at end of file diff --git a/src/SdkCommon/Test/ClientRuntime.E2E.Tests/ClientRuntime.E2E.Tests.csproj b/src/SdkCommon/Test/ClientRuntime.E2E.Tests/ClientRuntime.E2E.Tests.csproj index 94789abd34f40..6d0e5c030458d 100644 --- a/src/SdkCommon/Test/ClientRuntime.E2E.Tests/ClientRuntime.E2E.Tests.csproj +++ b/src/SdkCommon/Test/ClientRuntime.E2E.Tests/ClientRuntime.E2E.Tests.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/SdkCommon/Test/ClientRuntime.Tracing.Tests/Microsoft.Rest.ClientRuntime.Tracing.Tests.csproj b/src/SdkCommon/Test/ClientRuntime.Tracing.Tests/Microsoft.Rest.ClientRuntime.Tracing.Tests.csproj index ce65348fb91ad..2fd4f3c660f6f 100644 --- a/src/SdkCommon/Test/ClientRuntime.Tracing.Tests/Microsoft.Rest.ClientRuntime.Tracing.Tests.csproj +++ b/src/SdkCommon/Test/ClientRuntime.Tracing.Tests/Microsoft.Rest.ClientRuntime.Tracing.Tests.csproj @@ -7,6 +7,10 @@ Microsoft.Rest.ClientRuntime.Tracing.Tests Microsoft AutoRest ClientRuntime REST + + true + true + net452 diff --git a/src/SdkCommon/TestFramework/TestFramework.Net45Tests/TestFramework.Net45Tests.csproj b/src/SdkCommon/TestFramework/TestFramework.Net45Tests/TestFramework.Net45Tests.csproj index 1cad04cfdd052..8253f8a47982f 100644 --- a/src/SdkCommon/TestFramework/TestFramework.Net45Tests/TestFramework.Net45Tests.csproj +++ b/src/SdkCommon/TestFramework/TestFramework.Net45Tests/TestFramework.Net45Tests.csproj @@ -7,9 +7,12 @@ Testframework 452 test for Test Framework 1.0.0 - + + true + true + - + diff --git a/src/SdkCommon/clientruntime.reference.props b/src/SdkCommon/clientruntime.reference.props index e12d48a58d546..fca7cae34db2d 100644 --- a/src/SdkCommon/clientruntime.reference.props +++ b/src/SdkCommon/clientruntime.reference.props @@ -1,5 +1,5 @@ - + diff --git a/test.props b/test.props deleted file mode 100644 index 7c8c0f72e514a..0000000000000 --- a/test.props +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/tools/LocalNugetFeed/Microsoft.Internal.NetSdkBuild.Mgmt.Tools.0.10.0.nupkg b/tools/LocalNugetFeed/Microsoft.Internal.NetSdkBuild.Mgmt.Tools.0.10.0.nupkg new file mode 100644 index 0000000000000..dda2635c3b744 Binary files /dev/null and b/tools/LocalNugetFeed/Microsoft.Internal.NetSdkBuild.Mgmt.Tools.0.10.0.nupkg differ diff --git a/tools/bootstrapTools/bootstrap.targets b/tools/bootstrapTools/bootstrap.targets index 5b75c6c4847f6..06c806104c32f 100644 --- a/tools/bootstrapTools/bootstrap.targets +++ b/tools/bootstrapTools/bootstrap.targets @@ -2,11 +2,17 @@ - + + + + + - - - + + + + + \ No newline at end of file