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

Release/4.2.1 #49

Merged
merged 39 commits into from
Apr 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
9f19ee2
update version to 4.2.1
max-ieremenko Nov 28, 2023
9c8df77
.sln update dependencies
max-ieremenko Mar 17, 2024
540fceb
chang unit tests assertions to Shouldly
max-ieremenko Mar 17, 2024
5012dfe
third party notices update dependencies
max-ieremenko Mar 17, 2024
76d3c34
Merge pull request #37 from max-ieremenko/feature/update-dependencies
max-ieremenko Mar 17, 2024
78b47ea
upgrade to actions/*@v4
max-ieremenko Mar 17, 2024
23e6bd1
Merge pull request #38 from max-ieremenko/build/fix-warns
max-ieremenko Mar 17, 2024
b1008ef
.net sdk 8.0.200
max-ieremenko Mar 17, 2024
81a7701
upgrade sdk versions
max-ieremenko Mar 17, 2024
e0e99f8
Merge pull request #39 from max-ieremenko/build/update-sdk
max-ieremenko Mar 17, 2024
8141e7b
c 2024
max-ieremenko Mar 17, 2024
6c361b0
Merge pull request #40 from max-ieremenko/feature/c
max-ieremenko Mar 17, 2024
6d00732
update dependencies
max-ieremenko Mar 17, 2024
50a0a0d
Merge pull request #41 from max-ieremenko/build/update-dependencies
max-ieremenko Mar 17, 2024
ebec041
nuget/pwsh module release notes: target the concrete release page
max-ieremenko Mar 17, 2024
032953c
Merge pull request #42 from max-ieremenko/feature/target-release-page
max-ieremenko Mar 17, 2024
7cc6810
<ImplicitUsings>enable</ImplicitUsings>
max-ieremenko Mar 17, 2024
5681289
Merge pull request #43 from max-ieremenko/feature/implicit-usings
max-ieremenko Mar 17, 2024
35b5146
always pull images
max-ieremenko Mar 17, 2024
db2723f
handle pattern preview-[version]
max-ieremenko Mar 17, 2024
63d4226
Merge pull request #44 from max-ieremenko/build/cleanup
max-ieremenko Mar 17, 2024
1bf9433
powershell 7.4 test coverage
max-ieremenko Mar 17, 2024
25847ce
Merge pull request #45 from max-ieremenko/feature/pwsh-7.4
max-ieremenko Mar 17, 2024
791a7b7
powershell 7.5 test coverage
max-ieremenko Mar 17, 2024
0cb52a0
Merge pull request #46 from max-ieremenko/feature/pwsh-7.5
max-ieremenko Mar 17, 2024
43d5922
gitignore .csproj.user
max-ieremenko Mar 29, 2024
72b3371
resolve environment version at runtime
max-ieremenko Mar 29, 2024
c0afa20
PowerShellScripts netstandard2.0
max-ieremenko Mar 29, 2024
d22d9c0
AssemblyScripts netstandard2.0
max-ieremenko Mar 29, 2024
804a418
remove #if
max-ieremenko Mar 29, 2024
59d24fa
MsSql netstandard2.0
max-ieremenko Mar 29, 2024
6081544
PowerShell rm netstandard2.0 from bin
max-ieremenko Mar 29, 2024
fae0e9e
update third party notices
max-ieremenko Mar 29, 2024
111962e
Merge pull request #47 from max-ieremenko/feature/rm-coditional-compi…
max-ieremenko Mar 29, 2024
f3e68e5
file system is relative to the current directory
max-ieremenko Apr 13, 2024
61deeba
SqlDatabase.CommandLine
max-ieremenko Apr 13, 2024
e5913d1
Merge pull request #48 from max-ieremenko/feature/command-line
max-ieremenko Apr 13, 2024
e6d8b23
fix typo
max-ieremenko Apr 13, 2024
46cca19
add pwsh rlease history link
max-ieremenko Apr 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install dependencies
shell: pwsh
Expand All @@ -35,7 +35,7 @@ jobs:
run: ./Build/build.ps1 -Mode "github" -GithubToken "${{ secrets.GITHUB_TOKEN }}"

- name: Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: packages
path: |
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ bin/
build.out/

launchSettings.json
launchSettings.txt
*.sln.DotSettings.user
*.csproj.user

todo.txt
4 changes: 2 additions & 2 deletions Build/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ build.ps1 is designed to run on windows
- PowerShell Desktop 5.1
- PowerShell [7.3.0](https://github.com/PowerShell/PowerShell/releases/tag/v7.3.0) for .net 7.0 and 8.0 tests
- PowerShell [7.2.1](https://github.com/PowerShell/PowerShell/releases/tag/v7.2.1) for .net 6.0 tests
- Install-Module -Name [InvokeBuild](https://www.powershellgallery.com/packages/InvokeBuild/5.10.4) -RequiredVersion 5.10.4
- Install-Module -Name [ThirdPartyLibraries](https://www.powershellgallery.com/packages/ThirdPartyLibraries/3.4.1) -RequiredVersion 3.4.1
- Install-Module -Name [InvokeBuild](https://www.powershellgallery.com/packages/InvokeBuild/5.11.0) -RequiredVersion 5.11.0
- Install-Module -Name [ThirdPartyLibraries](https://www.powershellgallery.com/packages/ThirdPartyLibraries/3.5.1) -RequiredVersion 3.5.1
- .net framework 4.7.2+ sdk
- .net 8.0 sdk
- docker, switched to linux containers
Expand Down
4 changes: 2 additions & 2 deletions Build/build.ps1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Requires -Version "7.0"
#Requires -Modules @{ ModuleName="InvokeBuild"; ModuleVersion="5.10.4" }
#Requires -Modules @{ ModuleName="ThirdPartyLibraries"; ModuleVersion="3.4.1" }
#Requires -Modules @{ ModuleName="InvokeBuild"; ModuleVersion="5.11.0" }
#Requires -Modules @{ ModuleName="ThirdPartyLibraries"; ModuleVersion="3.5.1" }

[CmdletBinding()]
param (
Expand Down
2 changes: 1 addition & 1 deletion Build/create-images.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Requires -Version "7.0"
#Requires -Modules @{ ModuleName="InvokeBuild"; ModuleVersion="5.10.4" }
#Requires -Modules @{ ModuleName="InvokeBuild"; ModuleVersion="5.11.0" }

Set-StrictMode -Version Latest

Expand Down
4 changes: 2 additions & 2 deletions Build/install-dependencies.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ $ErrorActionPreference = "Stop"
. (Join-Path $PSScriptRoot "scripts/Invoke-InstallModule.ps1")

if (".net" -in $List) {
Invoke-InstallDotNet -Version "6.0.319"
Invoke-InstallDotNet -Version "7.0.100"
Invoke-InstallDotNet -Version "6.0.419"
Invoke-InstallDotNet -Version "7.0.406"

$version = (Get-Content -Raw (Join-Path $PSScriptRoot "../Sources/global.json") | ConvertFrom-Json).sdk.version
Invoke-InstallDotNet -Version $version
Expand Down
34 changes: 19 additions & 15 deletions Build/show-powershell-images.ps1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$ErrorActionPreference = "Stop"
$ErrorActionPreference = 'Stop'

function Get-ShortVersion {
[CmdletBinding()]
Expand All @@ -9,23 +9,27 @@ function Get-ShortVersion {
)

process {
$parts = $FullVersion -split "-"
$result = $parts[0]
# preview-7.5-ubuntu-20.04
# 7.4-ubuntu-22.04
# 7.3.0-preview.1-ubuntu-20.04
$parts = $FullVersion -split '-'
$version = $parts[0]
$tag = $parts[1]

if ($parts[1] -like "preview*") {
$result += "-" + $parts[1]
if ($version -like 'preview*') {
$version = $parts[1]
$tag = $parts[0]
}

return $result
if ($tag -like 'preview*') {
$version += '-' + $tag
}

return $version
}
}

(Invoke-RestMethod -Uri "https://mcr.microsoft.com/v2/powershell/tags/list").tags `
| Where-Object {$_ -Like "[0-9]*"} `
| Get-ShortVersion `
| Sort-Object -Unique

# (Invoke-RestMethod -Uri "https://mcr.microsoft.com/v2/powershell/tags/list").tags `
# | Where-Object {$_ -Like "7.2.0*"} `
# | Where-Object {($_ -Like "*ubuntu*") -or ($_ -Like "*alpine*")} `
# | Sort-Object
(Invoke-RestMethod -Uri 'https://mcr.microsoft.com/v2/powershell/tags/list').tags `
| Where-Object { ($_ -Like '[0-9]*') -or ($_ -Like 'preview-[0-9]*') } `
| Get-ShortVersion `
| Sort-Object -Unique
12 changes: 6 additions & 6 deletions Build/tasks/build-tasks.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ task PackGlobalTool {
}

task PackPoweShellModule {
$source = Join-Path $settings.bin "SqlDatabase.PowerShell\netstandard2.0\"
$source = Join-Path $settings.bin "SqlDatabase.PowerShell"
$dest = $settings.artifactsPowerShell

Copy-Item -Path $source -Destination $dest -Recurse
Expand Down Expand Up @@ -204,14 +204,14 @@ task PsCoreTest {
, "mcr.microsoft.com/powershell:7.2.0-ubuntu-20.04"
, "mcr.microsoft.com/powershell:7.2.1-ubuntu-20.04"
, "mcr.microsoft.com/powershell:7.2.2-ubuntu-20.04"
, "mcr.microsoft.com/powershell:7.3-ubuntu-20.04")

foreach ($image in $images) {
exec { docker pull $image }
}
, "mcr.microsoft.com/powershell:7.3-ubuntu-20.04"
, "mcr.microsoft.com/powershell:7.4-ubuntu-20.04"
, "mcr.microsoft.com/powershell:preview-7.5-ubuntu-20.04")

$builds = @()
foreach ($image in $images) {
exec { docker pull -q $image }

foreach ($database in $databases) {
$builds += @{
File = "build-tasks.it-ps-core.ps1"
Expand Down
9 changes: 9 additions & 0 deletions Build/tasks/create-images-tasks.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ task BuildMsSqlDatabase {
$dockerfile = Join-Path $context "image-mssql-2017.dockerfile"
exec {
docker build `
--pull `
-f $dockerfile `
-t sqldatabase/mssql:2017 `
$context
Expand All @@ -27,6 +28,7 @@ task BuildPgSqlDatabase {
$dockerfile = Join-Path $context "image-postgres-133.dockerfile"
exec {
docker build `
--pull `
-f $dockerfile `
-t sqldatabase/postgres:13.3 `
$context
Expand All @@ -37,6 +39,7 @@ task BuildMySqlDatabase {
$dockerfile = Join-Path $context "image-mysql-8025.dockerfile"
exec {
docker build `
--pull `
-f $dockerfile `
-t sqldatabase/mysql:8.0.25 `
$context
Expand All @@ -47,6 +50,7 @@ task BuildDotnetSdk60 {
$dockerfile = Join-Path $context "image-dotnet-sdk-6.0.dockerfile"
exec {
docker build `
--pull `
-f $dockerfile `
-t sqldatabase/dotnet_pwsh:6.0-sdk `
.
Expand All @@ -57,6 +61,7 @@ task BuildDotnetRuntime60 {
$dockerfile = Join-Path $context "image-dotnet-runtime-6.0.dockerfile"
exec {
docker build `
--pull `
-f $dockerfile `
-t sqldatabase/dotnet_pwsh:6.0-runtime `
.
Expand All @@ -67,6 +72,7 @@ task BuildDotnetSdk70 {
$dockerfile = Join-Path $context "image-dotnet-sdk-7.0.dockerfile"
exec {
docker build `
--pull `
-f $dockerfile `
-t sqldatabase/dotnet_pwsh:7.0-sdk `
.
Expand All @@ -77,6 +83,7 @@ task BuildDotnetRuntime70 {
$dockerfile = Join-Path $context "image-dotnet-runtime-7.0.dockerfile"
exec {
docker build `
--pull `
-f $dockerfile `
-t sqldatabase/dotnet_pwsh:7.0-runtime `
.
Expand All @@ -87,6 +94,7 @@ task BuildDotnetSdk80 {
$dockerfile = Join-Path $context "image-dotnet-sdk-8.0.dockerfile"
exec {
docker build `
--pull `
-f $dockerfile `
-t sqldatabase/dotnet_pwsh:8.0-sdk `
.
Expand All @@ -97,6 +105,7 @@ task BuildDotnetRuntime80 {
$dockerfile = Join-Path $context "image-dotnet-runtime-8.0.dockerfile"
exec {
docker build `
--pull `
-f $dockerfile `
-t sqldatabase/dotnet_pwsh:8.0-runtime `
.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>Dapper.StrongName</id>
<version>2.1.15</version>
<version>2.1.35</version>
<title>Dapper (Strong Named)</title>
<authors>Sam Saffron,Marc Gravell,Nick Craver</authors>
<owners>Sam Saffron,Marc Gravell,Nick Craver</owners>
Expand All @@ -14,10 +14,11 @@
<releaseNotes>https://dapperlib.github.io/Dapper/</releaseNotes>
<copyright>2019 Stack Exchange, Inc.</copyright>
<tags>orm sql micro-orm</tags>
<repository type="git" url="https://github.com/DapperLib/Dapper" commit="cdadfa6db61c9248b6e3169cc813be3df59c095f" />
<repository type="git" url="https://github.com/DapperLib/Dapper" commit="360367ca5475425944fb390433cb0f1817ad2dcb" />
<dependencies>
<group targetFramework=".NETFramework4.6.1" />
<group targetFramework=".NETFramework5.0" />
<group targetFramework=".NETFramework7.0" />
<group targetFramework=".NETStandard2.0">
<dependency id="System.Reflection.Emit.Lightweight" version="4.7.0" exclude="Build,Analyzers" />
</group>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Dapper.StrongName [2.1.15](https://www.nuget.org/packages/Dapper.StrongName/2.1.15)
Dapper.StrongName [2.1.35](https://www.nuget.org/packages/Dapper.StrongName/2.1.35)
--------------------

Used by: SqlDatabase internal
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Source": "https://api.nuget.org/v3/index.json",
"License": {
"Code": "ms-net-library",
"Code": "MIT",
"Status": "AutomaticallyApproved"
},
"UsedBy": [
Expand All @@ -19,9 +19,9 @@
"Licenses": [
{
"Subject": "package",
"Code": "ms-net-library",
"HRef": "LICENSE_NET.txt",
"Description": "The license file is identical to the file from version 17.4.0."
"Code": "MIT",
"HRef": "LICENSE_MIT.txt",
"Description": "The license file is identical to the repository license file."
},
{
"Subject": "repository",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Copyright (c) Microsoft Corporation.
The MIT License (MIT)

MIT License
Copyright (c) Microsoft Corporation

All rights reserved.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -12,10 +14,11 @@ furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

Loading