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.

Sign up for GitHub

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

Upgrade to 3.0 RTM packages and SDKs #426

Merged
merged 2 commits into from
Sep 23, 2019
Merged

Upgrade to 3.0 RTM packages and SDKs #426

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ca6160
Upgrade to 3.0 RTM packages and SDKs
Sep 23, 2019
cd5b116
Change rollForward to latestMajor
Sep 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ init:
- SET PATH=%POSTGRES_PATH%\bin;%MYSQL_PATH%\bin;%PATH%

install:
- choco install dotnetcore-sdk --version 3.0.100-preview9-014004
- choco install dotnetcore-sdk --version 3.0.100
- nuget install redis-64 -excludeversion
- redis-64\tools\redis-server.exe --service-install
- redis-64\tools\redis-server.exe --service-start
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ steps:
- task: UseDotNet@2
inputs:
packageType: 'sdk'
version: '3.0.100-preview9-014004'
version: '3.0.100'

- task: PowerShell@2
displayName: 'Build / Test / Create Packages'
Expand Down
3 changes: 2 additions & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"sdk": {
"version": "3.0.100-preview9-014004"
"version": "3.0.100",
"rollForward": "latestFeature"
Copy link

@ctyar ctyar Sep 23, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is latestFeature a valid value here?
The docs only mention these:
Disable, LatestPatch, Minor, LatestMinor, Major, LatestMajor

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question! I'm honestly not sure - see https://github.com/dotnet/designs/pull/71/files#examples-of-usage which is still unclear. I'm okay with latestMajor anyway (and we can tweak this any time) - so let's go with that :)

Note the docs for CLI are not the same as global.json :)

}
}
2 changes: 1 addition & 1 deletion samples/Samples.AspNetCore3/Samples.AspNetCore3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
<ProjectReference Include="..\..\src\MiniProfiler.EntityFrameworkCore\MiniProfiler.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\src\MiniProfiler.Providers.SqlServer\MiniProfiler.Providers.SqlServer.csproj" />
<ProjectReference Include="..\..\src\MiniProfiler.Providers.Sqlite\MiniProfiler.Providers.Sqlite.csproj" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0-rc1.19456.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/MiniProfiler.AspNetCore/MiniProfiler.AspNetCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="System.Text.Json" Version="4.6.0-rc1.19456.4" />
<PackageReference Include="System.Text.Json" Version="4.6.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net461' OR '$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "4.1.0-preview.{height}",
"version": "4.1.0",
"assemblyVersion": "4.0.0.0",
"publicReleaseRefSpec": [
"^refs/heads/master$", // we release out of master
Expand Down