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

v8 Updates #143

Merged
merged 13 commits into from
Aug 28, 2020
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "external/Prism"]
path = external/Prism
url = https://github.com/PrismLibrary/Prism.git
14 changes: 9 additions & 5 deletions Directory.build.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<PropertyGroup>
<Authors>dansiegel</Authors>
<Copyright>© Dan Siegel. All rights reserved.</Copyright>
<VersionPrefix>7.2.0</VersionPrefix>
<NeutralLanguage>en-US</NeutralLanguage>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
Expand All @@ -28,12 +27,12 @@
<GeneratePackageOnBuild>$(IsPackable)</GeneratePackageOnBuild>
<IS_PREVIEW Condition=" $(IS_PREVIEW) == '' ">false</IS_PREVIEW>
<IS_RELEASE Condition=" $(IS_RELEASE) == '' ">false</IS_RELEASE>
<VersionPrefix Condition=" $(BUILD_BUILDNUMBER) != '' ">$(VersionPrefix).$(BUILD_BUILDNUMBER)</VersionPrefix>
<VersionSuffix>ci</VersionSuffix>
<VersionSuffix Condition=" $(IS_PREVIEW) ">pre</VersionSuffix>
<VersionSuffix Condition=" $(IS_RELEASE) "></VersionSuffix>
</PropertyGroup>

<ItemGroup Condition=" $(IsPackable) == 'true' ">
<PackageReference Include="Nerdbank.GitVersioning" Version="3.2.31" PrivateAssets="all" />
</ItemGroup>

<PropertyGroup>
<!-- Strong Naming -->
<!--<SignAssembly>true</SignAssembly>
Expand Down Expand Up @@ -70,4 +69,9 @@
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
</PropertyGroup>

<ItemGroup Condition=" $(ProjectName.EndsWith('Tests')) ">
<Content Include="$(MSBuildThisFileDirectory)xunit.runner.json"
CopyToOutputDirectory="always" />
</ItemGroup>

</Project>
10 changes: 9 additions & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ stages:
- JDK
- AndroidSDK
steps:
- checkout: self
clean: true
lfs: true
submodules: true

- task: UseDotNet@2
inputs:
packageType: 'sdk'
Expand All @@ -69,6 +74,7 @@ stages:
- task: MSBuild@1
displayName: Build Projects
inputs:
solution: Prism.Container.Extensions.sln
configuration: $(BuildConfiguration)
msbuildArguments: '/p:DebugType=portable /p:JavaSdkDirectory="$(JAVA_HOME)" /restore'

Expand Down Expand Up @@ -131,11 +137,13 @@ stages:
- deployment: NuGet
displayName: NuGet.org
environment: NuGet
condition: and(succeeded(), or(eq(variables['IS_PREVIEW'], true), eq(variables['IS_RELEASE'], true)))
strategy:
runOnce:
deploy:
steps:
- checkout: self
clean: false

- powershell: ./Process-Release.ps1
name: processName
displayName: Process Artifacts for Release
Expand Down
1 change: 1 addition & 0 deletions external/Prism
Submodule Prism added at 4049b3
39 changes: 0 additions & 39 deletions src/Prism.Container.Extensions/ContainerExtensionAttribute.cs

This file was deleted.

62 changes: 0 additions & 62 deletions src/Prism.Container.Extensions/ContainerLocator.cs

This file was deleted.

32 changes: 0 additions & 32 deletions src/Prism.Container.Extensions/ContainerResolutionException.cs

This file was deleted.

39 changes: 0 additions & 39 deletions src/Prism.Container.Extensions/IExtendedContainerRegistry.cs

This file was deleted.

Loading