diff --git a/src/.editorconfig b/.editorconfig
similarity index 100%
rename from src/.editorconfig
rename to .editorconfig
diff --git a/.gitignore b/.gitignore
index bb0c5b44..f3644d8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
*.user
*.userosscache
*.sln.docstates
+*.sln
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
@@ -58,7 +59,6 @@ artifacts/
*.pdb
*.pgc
*.pgd
-*.rsp
*.sbr
*.tlb
*.tli
diff --git a/src/Directory.Build.props b/Directory.Build.props
similarity index 63%
rename from src/Directory.Build.props
rename to Directory.Build.props
index 53fc1723..25683773 100644
--- a/src/Directory.Build.props
+++ b/Directory.Build.props
@@ -5,15 +5,18 @@ Copyright (c) Microsoft Corporation. All rights reserved.
Licensed under the MIT License.
***********************************************************************************************
-->
-
+
+ 16.8
+ true
latest
- $(MSBuildThisFileDirectory)..\
+ $(MSBuildThisFileDirectory)
$(RepoRoot)build\
$(RepoRoot)src\
$(RepoRoot)scripts\
- %WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe
+ $(WINDIR)\System32\WindowsPowerShell\v1.0\powershell.exe
+ $(ProgramFiles)\PowerShell\7\pwsh.exe
-NoLogo -NoProfile -NonInteractive -ExecutionPolicy Unrestricted
en-US
@@ -37,10 +40,23 @@ Licensed under the MIT License.
https://github.com/Microsoft/powerbi-powershell
-
+
+ $(DefaultItemExcludes);*.binlog
+
+
+
+
+ true
+
+
+
+
+
+
+
-
+
-
+
\ No newline at end of file
diff --git a/Directory.Build.rsp b/Directory.Build.rsp
new file mode 100644
index 00000000..aa0ccc33
--- /dev/null
+++ b/Directory.Build.rsp
@@ -0,0 +1,4 @@
+-restore
+-consoleLoggerParameters:Verbosity=Minimal;Summary;ForceNoAlign
+-maxCpuCount
+-IgnoreProjectExtensions:.sln
\ No newline at end of file
diff --git a/Directory.Build.targets b/Directory.Build.targets
new file mode 100644
index 00000000..9b6d8abc
--- /dev/null
+++ b/Directory.Build.targets
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/NuGet.config b/NuGet.config
similarity index 100%
rename from src/NuGet.config
rename to NuGet.config
diff --git a/Packages.props b/Packages.props
new file mode 100644
index 00000000..29a102a8
--- /dev/null
+++ b/Packages.props
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/Microsoft.PowerBI.Build.targets b/build/Microsoft.PowerBI.Build.targets
index e70e9ae0..b1ab5699 100644
--- a/build/Microsoft.PowerBI.Build.targets
+++ b/build/Microsoft.PowerBI.Build.targets
@@ -10,19 +10,36 @@ Licensed under the MIT License.
portable
-
-
-
- false
- All
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+ $(OutputPath)\MSAL\netcoreapp2.1
+
+
+
+ $(OutputPath)\MSAL\net45
+
+
+
+
\ No newline at end of file
diff --git a/build/Microsoft.PowerBI.Packaging.targets b/build/Microsoft.PowerBI.Packaging.targets
index e103bb4e..e46c67f9 100644
--- a/build/Microsoft.PowerBI.Packaging.targets
+++ b/build/Microsoft.PowerBI.Packaging.targets
@@ -11,14 +11,12 @@ Licensed under the MIT License.
true
true
false
- $(RepoRoot)\PkgOut
+ $(RepoRoot)PkgOut
@@ -35,7 +33,11 @@ Licensed under the MIT License.
-
+
@@ -45,16 +47,10 @@ Licensed under the MIT License.
-
+
- <_PackageFiles Include="$(OutputPath)\WindowsAuthenticator\**\*.*" Condition="Exists('$(OutputPath)\WindowsAuthenticator')">
- Content
- true
- lib\$(TargetFramework)\WindowsAuthenticator
-
-
<_PackageFiles Include="$(OutputPath)\settings.json" Condition="Exists('$(OutputPath)\settings.json') AND '$(NoDependentAssemblies)' != 'true'">
Content
true
@@ -73,6 +69,12 @@ Licensed under the MIT License.
lib\$(TargetFramework)
+ <_PackageFiles Include="$(OutputPath)\MSAL\**\*.*" Condition="Exists('$(OutputPath)\MSAL')">
+ Content
+ true
+ lib\$(TargetFramework)\MSAL\%(RecursiveDir)
+
+
<_PackageFiles Include="$(OutputPath)\$(LangName)\**\*.*" Condition="'$(NoHelpGen)' != 'true'">
Content
true
diff --git a/dirs.proj b/dirs.proj
new file mode 100644
index 00000000..4d200b3c
--- /dev/null
+++ b/dirs.proj
@@ -0,0 +1,24 @@
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/global.json b/global.json
new file mode 100644
index 00000000..159eab85
--- /dev/null
+++ b/global.json
@@ -0,0 +1,11 @@
+{
+ "sdk": {
+ "version": "5.0.101"
+ },
+ "msbuild-sdks": {
+ "Microsoft.Build.Traversal": "3.0.2",
+ "Microsoft.Build.CentralPackageVersions": "2.0.79",
+ "Microsoft.Build.NoTargets": "2.0.1",
+ "Microsoft.Build.Artifacts": "2.0.35"
+ }
+}
\ No newline at end of file
diff --git a/init.ps1 b/init.ps1
new file mode 100644
index 00000000..4a3d5ffa
--- /dev/null
+++ b/init.ps1
@@ -0,0 +1,16 @@
+$scriptsDir = (Get-Item "$PSScriptRoot\scripts").FullName
+
+if($env:Path -split ';' -inotcontains $scriptsDir) {
+ Write-Verbose "Adding '$scriptsDir' to Path environment variable..."
+ $env:Path = $env:Path.TrimEnd(';')
+ $env:Path += ";$scriptsDir"
+}
+
+$scripts = Get-ChildItem -Path $scriptsDir -Filter *.ps1
+foreach ($script in $scripts) {
+ $scriptName = $script.BaseName
+ Set-Alias -Name $scriptName -Value $script.FullName -Scope Global -Option AllScope -ErrorAction SilentlyContinue
+}
+
+Write-Host "Any script (*.ps1) in $scriptsDir can be called with just name of script, example 'build'" -ForegroundColor Gray
+Write-Host "Welcome to powerbi-powershell repository!`n" -ForegroundColor Green
\ No newline at end of file
diff --git a/scripts/Build.ps1 b/scripts/Build.ps1
index 1dd58e70..78641dbe 100644
--- a/scripts/Build.ps1
+++ b/scripts/Build.ps1
@@ -19,9 +19,9 @@
[CmdletBinding()]
param
(
- # Path to solution file. Defaults to