Browse Source

disable gv for test

Oren Novotny 8 years ago
parent
commit
3f58d092c4

+ 3 - 3
Rx.NET/Source/Directory.build.props

@@ -21,10 +21,10 @@
   </PropertyGroup>
   </PropertyGroup>
   
   
     <ItemGroup>
     <ItemGroup>
-    <PackageReference Include="GitVersionTask" Version="4.0.0-beta0011" PrivateAssets="All" />
+    <!--<PackageReference Include="GitVersionTask" Version="4.0.0-beta0011" PrivateAssets="All" /> -->
     <PackageReference Include="MSBuild.Sdk.Extras" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="MSBuild.Sdk.Extras" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="SourceLink.Create.GitHub" Version="2.1.0-b412" PrivateAssets="All" /> 
-    <DotNetCliToolReference Include="dotnet-sourcelink-git" Version="2.1.0-b412" /> 
+    <PackageReference Include="SourceLink.Create.GitHub" Version="2.0.2" PrivateAssets="All" /> 
+    <DotNetCliToolReference Include="dotnet-sourcelink-git" Version="2.0.2" /> 
   </ItemGroup>
   </ItemGroup>
   
   
   
   

+ 1 - 1
Rx.NET/Source/Directory.build.targets

@@ -1,7 +1,7 @@
 <Project>  
 <Project>  
   <!-- This has to be set in targets as the default props will overwrite -->
   <!-- This has to be set in targets as the default props will overwrite -->
   <PropertyGroup>
   <PropertyGroup>
-    <DebugType>portable</DebugType>
+    <DebugType>embedded</DebugType>
   </PropertyGroup>
   </PropertyGroup>
   
   
   <!-- This props all need to be set in targets as they depend on the values set earlier -->
   <!-- This props all need to be set in targets as they depend on the values set earlier -->

+ 1 - 1
Rx.NET/Source/NuGet.Config

@@ -4,6 +4,6 @@
     <add key="xUnit CI" value="https://www.myget.org/F/xunit/api/v3/index.json" />
     <add key="xUnit CI" value="https://www.myget.org/F/xunit/api/v3/index.json" />
     <add key="Build Packages" value="https://www.myget.org/F/c037199d-41df-4567-b966-25ff65324688/api/v3/index.json" />
     <add key="Build Packages" value="https://www.myget.org/F/c037199d-41df-4567-b966-25ff65324688/api/v3/index.json" />
     <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
     <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="sourcelink" value="https://ci.appveyor.com/nuget/sourcelink/" /> 
+    <!-- <add key="sourcelink" value="https://ci.appveyor.com/nuget/sourcelink/" /> -->
   </packageSources>
   </packageSources>
 </configuration>
 </configuration>

+ 5 - 0
Rx.NET/Source/build-new.ps1

@@ -28,10 +28,15 @@ if (!(Test-Path .\nuget.exe)) {
 # get tools
 # get tools
 .\nuget.exe install -excludeversion SignClient -Version 0.5.0-beta4 -pre -outputdirectory packages
 .\nuget.exe install -excludeversion SignClient -Version 0.5.0-beta4 -pre -outputdirectory packages
 .\nuget.exe install -excludeversion JetBrains.dotCover.CommandLineTools -pre -outputdirectory packages
 .\nuget.exe install -excludeversion JetBrains.dotCover.CommandLineTools -pre -outputdirectory packages
+.\nuget.exe install -excludeversion gitversion.commandline -pre -outputdirectory packages
 #.\nuget.exe install -excludeversion OpenCover -Version 4.6.519 -outputdirectory packages
 #.\nuget.exe install -excludeversion OpenCover -Version 4.6.519 -outputdirectory packages
 .\nuget.exe install -excludeversion ReportGenerator -outputdirectory packages
 .\nuget.exe install -excludeversion ReportGenerator -outputdirectory packages
 #.\nuget.exe install -excludeversion coveralls.io -outputdirectory packages
 #.\nuget.exe install -excludeversion coveralls.io -outputdirectory packages
 
 
+
+#update version
+# .\packages\gitversion.commandline\tools\gitversion.exe /l console /output buildserver
+
 New-Item -ItemType Directory -Force -Path $artifacts
 New-Item -ItemType Directory -Force -Path $artifacts
 
 
 Write-Host "Restoring packages for $scriptPath\System.Reactive.sln" -Foreground Green
 Write-Host "Restoring packages for $scriptPath\System.Reactive.sln" -Foreground Green

+ 3 - 0
Rx.NET/Source/tests/Directory.build.targets

@@ -1,3 +1,6 @@
 <Project>  
 <Project>  
   <Import Project="..\Directory.build.targets" />
   <Import Project="..\Directory.build.targets" />
+  <PropertyGroup>
+    <DebugType>portable</DebugType>
+  </PropertyGroup>
 </Project>
 </Project>