Minor changes

dotnet · Oct 16, 2019 · 358b283 · 358b283
1 parent cfa4c5d
commit 358b283
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 23 deletions.
diff --git a/build-addons.cmd b/build-addons.cmd
@@ -1,4 +1,5 @@
 msbuild /p:configuration=Release /t:clean
+msbuild /p:configuration=Release
 msbuild /p:configuration=Release /t:BuildAKVNetFx
 msbuild /p:configuration=Release /t:BuildAKVNetCore
 msbuild /p:configuration=Release /t:GenerateAKVProviderNugetPackage
diff --git a/build.proj b/build.proj
@@ -47,21 +47,15 @@
   <Target Name="BuildTestsNetFx"           DependsOnTargets="BuildAKVNetFx;BuildFunctionalTestsNetFx;BuildManualTestsNetFx" />
 
   <Target Name="RestoreNetCore">
-    <PropertyGroup>
-      <NugetPackageSourcesProperty>@(NugetPackageSources)</NugetPackageSourcesProperty>
-    </PropertyGroup>
-    <MSBuild Projects="@(NetCoreDriver)" Targets="restore" Properties="RestoreSources=$(NugetPackageSourcesProperty);TestTargetOS=$(TestOS)netcoreapp" />
-    <MSBuild Projects="@(ManualTests)" Targets="restore" Properties="RestoreSources=$(NugetPackageSourcesProperty);TestTargetOS=$(TestOS)netcoreapp" />
-    <MSBuild Projects="@(FunctionalTests)" Targets="restore" Properties="RestoreSources=$(NugetPackageSourcesProperty);TestTargetOS=$(TestOS)netcoreapp" />
+    <MSBuild Projects="@(NetCoreDriver)" Targets="restore" Properties="TestTargetOS=$(TestOS)netcoreapp" />
+    <MSBuild Projects="@(ManualTests)" Targets="restore" Properties="TestTargetOS=$(TestOS)netcoreapp" />
+    <MSBuild Projects="@(FunctionalTests)" Targets="restore" Properties="TestTargetOS=$(TestOS)netcoreapp" />
   </Target>
 
   <Target Name="RestoreNetFx" Condition="'$(IsEnabledNetFx)' == 'true'">
-    <PropertyGroup>
-      <NugetPackageSourcesProperty>@(NugetPackageSources)</NugetPackageSourcesProperty>
-    </PropertyGroup>
-    <MSBuild Projects="@(NetFxDriver)" Targets="restore" Properties="RestoreSources=$(NugetPackageSourcesProperty);TestTargetOS=$(TestOS)netfx" />
-    <MSBuild Projects="@(ManualTests)" Targets="restore" Properties="RestoreSources=$(NugetPackageSourcesProperty);TestTargetOS=$(TestOS)netfx" />
-    <MSBuild Projects="@(FunctionalTests)" Targets="restore" Properties="RestoreSources=$(NugetPackageSourcesProperty);TestTargetOS=$(TestOS)netfx" />
+    <MSBuild Projects="@(NetFxDriver)" Targets="restore" Properties="TestTargetOS=$(TestOS)netfx" />
+    <MSBuild Projects="@(ManualTests)" Targets="restore" Properties="TestTargetOS=$(TestOS)netfx" />
+    <MSBuild Projects="@(FunctionalTests)" Targets="restore" Properties="TestTargetOS=$(TestOS)netfx" />
   </Target>
 
   <Target Name="BuildNetFx" DependsOnTargets="RestoreNetFx" Condition="'$(IsEnabledNetFx)' == 'true'">
@@ -105,16 +99,16 @@
   <Target Name="BuildAddOns"           DependsOnTargets="BuildAKVProvider" />
   <Target Name="BuildAKVProvider"      DependsOnTargets="BuildAKVNetFx;BuildAKVNetCore;GenerateAKVProviderNugetPackage" />
 
-  <Target Name="BuildAKVNetFx" DependsOnTargets="BuildNetFx">
+  <Target Name="BuildAKVNetFx">
     <MSBuild Projects="@(AKVProvider)" Targets="restore" Properties="TestTargetOS=$(TestOS)netfx" />
     <MSBuild Projects="@(AKVProvider)" Properties="TestTargetOS=$(TestOS)netfx;Platform=AnyCPU;$(ProjectProperties)" />
   </Target>
 
-  <Target Name="BuildAKVNetCore" DependsOnTargets="BuildNetCoreAllOS">
+  <Target Name="BuildAKVNetCore">
     <MSBuild Projects="@(AKVProvider)" Targets="restore" Properties="TestTargetOS=$(TestOS)netcoreapp" />
-    <MSBuild Projects="@(AKVProvider)"  Properties="$(ProjectProperties);Platform=AnyCPU;OSGroup=Unix;"  RemoveProperties="TargetsWindows;TargetsUnix;" />
-    <MSBuild Projects="@(AKVProvider)"  Properties="$(ProjectProperties);Platform=AnyCPU;OSGroup=Windows_NT;"  RemoveProperties="TargetsWindows;TargetsUnix;" />
-    <MSBuild Projects="@(AKVProvider)"  Properties="$(ProjectProperties);Platform=AnyCPU;OSGroup=AnyOS;"  RemoveProperties="TargetsWindows;TargetsUnix;" />
+    <MSBuild Projects="@(AKVProvider)"  Properties="TestTargetOS=$(TestOS)netcoreapp;$(ProjectProperties);Platform=AnyCPU;OSGroup=Unix;"  RemoveProperties="TargetsWindows;TargetsUnix;" />
+    <MSBuild Projects="@(AKVProvider)"  Properties="TestTargetOS=$(TestOS)netcoreapp;$(ProjectProperties);Platform=AnyCPU;OSGroup=Windows_NT;"  RemoveProperties="TargetsWindows;TargetsUnix;" />
+    <MSBuild Projects="@(AKVProvider)"  Properties="TestTargetOS=$(TestOS)netcoreapp;$(ProjectProperties);Platform=AnyCPU;OSGroup=AnyOS;"  RemoveProperties="TargetsWindows;TargetsUnix;" />
   </Target>
 
 </Project>
diff --git a/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec b/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec
@@ -41,27 +41,21 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti
     <file src="..\..\icons\dotnet.png" target="" />
 
     <!--  NetFx Files  -->
-    <!--file src="..\..\..\bin\Windows_NT\$Configuration$\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider\ref\net46\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.dll" target="ref\net46\" exclude="" />
-    <file src="..\..\..\bin\Windows_NT\$Configuration$\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider\ref\net46\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb" target="ref\net46\" exclude="" />
-    <file src="..\..\..\bin\Windows_NT\$Configuration$\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider\ref\net46\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.xml" target="ref\net46\" exclude="" /-->
     <file src="..\..\..\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider\net46\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.dll" target="lib\net46\" exclude="" />
     <file src="..\..\..\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider\net46\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb" target="lib\net46\" exclude="" />
     <file src="..\..\..\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider\net46\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.xml" target="lib\net46\" exclude="" />
     <file src="..\..\..\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider\net46\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.dll" target="runtimes\win\lib\net46\" exclude="" />
     <file src="..\..\..\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider\net46\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb" target="runtimes\win\lib\net46\" exclude="" />
 
     <!--  NetCore Files  -->
-    <!--file src="..\..\..\bin\AnyOS\$Configuration$\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider\ref\netcoreapp2.1\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.dll" target="ref\netcoreapp2.1\" exclude="" /-->
     <file src="..\..\..\bin\AnyOS\$Configuration$.AnyCPU\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider\netcoreapp2.1\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.dll" target="lib\netcoreapp2.1\" exclude="" />
     <file src="..\..\..\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider\netcoreapp2.1\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.dll" target="runtimes\win\lib\netcoreapp2.1\" exclude="" />
     <file src="..\..\..\bin\Unix\$Configuration$.AnyCPU\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider\netcoreapp2.1\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.dll" target="runtimes\unix\lib\netcoreapp2.1\" exclude="" />
 
-    <!--file src="..\..\..\bin\AnyOS\$Configuration$\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider\ref\netcoreapp2.1\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb" target="ref\netcoreapp2.1\" exclude="" /-->
     <file src="..\..\..\bin\AnyOS\$Configuration$.AnyCPU\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider\netcoreapp2.1\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb" target="lib\netcoreapp2.1\" exclude="" />
     <file src="..\..\..\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider\netcoreapp2.1\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb" target="runtimes\win\lib\netcoreapp2.1\" exclude="" />
     <file src="..\..\..\bin\Unix\$Configuration$.AnyCPU\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider\netcoreapp2.1\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.pdb" target="runtimes\unix\lib\netcoreapp2.1\" exclude="" />
 
-    <!--file src="..\..\..\bin\AnyOS\$Configuration$\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider\ref\netcoreapp2.1\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.xml" target="ref\netcoreapp2.1\" exclude="" /-->
     <file src="..\..\..\bin\AnyOS\$Configuration$.AnyCPU\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider\netcoreapp2.1\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.xml" target="lib\netcoreapp2.1\" exclude="" />
   </files>
 </package>