Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update sdk and deps for preview 8 #1016

Merged
merged 2 commits into from Aug 19, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/release-drafter.yml

This file was deleted.

4 changes: 2 additions & 2 deletions Ix.NET/Source/Directory.build.props
Expand Up @@ -22,8 +22,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19408-01" PrivateAssets="All"/>
<PackageReference Include="Nerdbank.GitVersioning" Version="2.3.183" PrivateAssets="all" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All"/>
<PackageReference Include="Nerdbank.GitVersioning" Version="3.0.25" PrivateAssets="all" />
</ItemGroup>


Expand Down
13 changes: 0 additions & 13 deletions Ix.NET/Source/NuGet.config

This file was deleted.

2 changes: 1 addition & 1 deletion Ix.NET/Source/version.json
@@ -1,5 +1,5 @@
{
"version": "4.0.0-preview.7.build.{height}",
"version": "4.0.0-preview.8.build.{height}",
"publicReleaseRefSpec": [
"^refs/heads/master$", // we release out of master
"^refs/heads/rel/v\\d+\\.\\d+" // we also release branches starting with vN.N
Expand Down
13 changes: 1 addition & 12 deletions Rx.NET/Integration/NuGet.Config
@@ -1,17 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
<add key="dotnet-windowsdesktop" value="https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json" />
<add key="aspnet-aspnetcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />
<add key="aspnet-aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
<add key="aspnet-entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
<add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
<add key="gRPC repository" value="https://grpc.jfrog.io/grpc/api/nuget/v3/grpc-nuget-dev" />

<add key="myget.org rxnet" value="https://dotnet.myget.org/F/rx/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="Local Packages" value="./LocalPackages" />
</packageSources>
</packageSources>
</configuration>
2 changes: 1 addition & 1 deletion Rx.NET/Integration/global.json
Expand Up @@ -3,6 +3,6 @@
"version": "3.0.100-preview"
},
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "2.0.0-preview.14"
"MSBuild.Sdk.Extras": "2.0.31"
}
}
10 changes: 5 additions & 5 deletions Rx.NET/Source/Directory.build.props
@@ -1,4 +1,4 @@
<Project>
<Project>
<PropertyGroup>
<Copyright>Copyright (c) .NET Foundation and Contributors.</Copyright>
<MinClientVersion>2.12</MinClientVersion>
Expand All @@ -21,15 +21,15 @@
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<LangVersion>latest</LangVersion>
</PropertyGroup>


<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19408-01" PrivateAssets="All"/>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All"/>
<PackageReference Include="Nerdbank.GitVersioning" Version="3.0.25" PrivateAssets="all" />
</ItemGroup>

<ItemGroup Condition="'$(IsTestProject)' == 'true'">
<PackageReference Include="coverlet.collector" Version="1.0.1" />
</ItemGroup>
</ItemGroup>

</Project>
13 changes: 0 additions & 13 deletions Rx.NET/Source/NuGet.config

This file was deleted.

5 changes: 1 addition & 4 deletions azure-pipelines.ix.yml
Expand Up @@ -14,7 +14,6 @@ pr:
include:
- master
- rel/*
- IxAsyncCSharp8
paths:
include:
- Ix.NET/Source/*
Expand All @@ -31,7 +30,7 @@ variables:
steps:
- task: DotNetCoreInstaller@0
inputs:
version: '3.0.100-preview7-012588'
version: '3.0.100-preview8-013656'

- task: DotNetCoreCLI@2
inputs:
Expand All @@ -46,8 +45,6 @@ steps:
- task: DotNetCoreCLI@2
inputs:
command: restore
feedsToUse: config
nugetConfigPath: Ix.NET/Source/NuGet.config
projects: Ix.NET/Source/**/*.csproj
displayName: Restore

Expand Down
10 changes: 6 additions & 4 deletions azure-pipelines.rx.yml
Expand Up @@ -33,8 +33,9 @@ jobs:
steps:
- task: UseDotNet@2
inputs:
version: '3.0.100-preview7-012821'
version: '3.0.100-preview8-013656'
includePreviewVersions: true
performMultiLevelLookup: true

- task: DotNetCoreCLI@2
inputs:
Expand Down Expand Up @@ -103,7 +104,7 @@ jobs:
CODECOV_TOKEN: $(CODECOV_TOKEN)
displayName: Upload coverage to Codecov
condition: and(succeeded(), not(eq(variables['CODECOV_TOKEN'], '')))

- task: PowerShell@2
displayName: Authenticode Sign Packages
inputs:
Expand Down Expand Up @@ -134,7 +135,7 @@ jobs:
steps:
- task: UseDotNet@2
inputs:
version: '3.0.100-preview7-012821'
version: '3.0.100-preview8-013656'
includePreviewVersions: true

- task: UseDotNet@2
Expand Down Expand Up @@ -211,8 +212,9 @@ jobs:
steps:
- task: UseDotNet@2
inputs:
version: '3.0.100-preview7-012821'
version: '3.0.100-preview8-013656'
includePreviewVersions: true
performMultiLevelLookup: true

- task: DotNetCoreCLI@2
inputs:
Expand Down