未验证 提交 0959e07f 编写于 作者: S Shay Rojansky 提交者: GitHub

Bump dotnet SDK to 7.0.100-preview.4.22252.9 (#2359)

And stop explicitly specifying the version in our CI workflow
(use global.json)
上级 95c8667b
......@@ -11,7 +11,6 @@ on:
pull_request:
env:
dotnet_sdk_version: '7.0.100-preview.3.22179.4'
postgis_version: 3
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
......@@ -47,8 +46,6 @@ jobs:
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v2
with:
dotnet-version: ${{ env.dotnet_sdk_version }}
- name: Build
run: dotnet build --configuration Debug
......@@ -143,8 +140,6 @@ jobs:
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v2
with:
dotnet-version: ${{ env.dotnet_sdk_version }}
- name: Pack
run: dotnet pack --configuration Release --output nupkgs --version-suffix "ci.$(date -u +%Y%m%dT%H%M%S)+sha.${GITHUB_SHA:0:9}" -p:ContinuousIntegrationBuild=true
......@@ -177,8 +172,6 @@ jobs:
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v2
with:
dotnet-version: ${{ env.dotnet_sdk_version }}
- name: Pack
run: dotnet pack --configuration Release --output nupkgs -p:ContinuousIntegrationBuild=true
......
......@@ -22,7 +22,7 @@
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageVersion Include="xunit" Version="2.4.2-pre.22" />
<PackageVersion Include="xunit" Version="2.4.2-pre.9" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
<PackageVersion Include="GitHubActionsTestLogger" Version="1.4.1" />
</ItemGroup>
......
......@@ -6,4 +6,28 @@
<add key="npgsql-vnext" value="https://www.myget.org/F/npgsql-vnext/api/v3/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
<packageSourceMapping>
<packageSource key="npgsql-vnext">
<package pattern="Npgsql.*" />
</packageSource>
<packageSource key="dotnet7">
<package pattern="*" />
</packageSource>
<packageSource key="dotnet-eng">
<!-- EF Core depends on xunit 2.4.2-pre.9 which is only in dotnet-eng.
But some xunit packages still need to come from nuget.org, so we cherry-pick. -->
<package pattern="xunit" />
<package pattern="xunit.assert" />
<package pattern="xunit.core" />
<package pattern="xunit.extensibility.core" />
<package pattern="xunit.extensibility.execution" />
</packageSource>
<packageSource key="nuget.org">
<package pattern="*" />
<!-- Our npgsql-vnext feed doesn't necessarily contain the last preview (package retention rules...), so we take it from nuget.org -->
<package pattern="Npgsql.*" />
</packageSource>
</packageSourceMapping>
</configuration>
{
"sdk": {
"version": "7.0.100-preview.3.22179.4",
"version": "7.0.100-preview.4.22252.9",
"rollForward": "latestMajor",
"allowPrerelease": "true"
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册